From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6126742C72 for ; Sat, 10 Jun 2023 00:02:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 61DA8410FB; Sat, 10 Jun 2023 00:02:29 +0200 (CEST) Received: from mail-pl1-f227.google.com (mail-pl1-f227.google.com [209.85.214.227]) by mails.dpdk.org (Postfix) with ESMTP id 68E0E40A84 for ; Sat, 10 Jun 2023 00:02:00 +0200 (CEST) Received: by mail-pl1-f227.google.com with SMTP id d9443c01a7336-1b00ffb4186so9545915ad.0 for ; Fri, 09 Jun 2023 15:02:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1686348119; x=1688940119; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=lRntLowtNnfRGahF5O6iBf62ItAmLkEAPSVsOSSbKps=; b=Nq48VLud+jquYRgb6OMjCkU7XeX3ZGxImn4jVozYiuzSNW9nJgERwUDOdbk3d4LRR5 gqUcjLYA5cVqVe5HFrF9Px6w5vHXqghcwQE0x14HAn2f2Mbb3d3nedQb8chxVQ1u82Ym m1h29Pz5CSDFCPNOXlfCxmq1TXnCR8jPauKIU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686348119; x=1688940119; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lRntLowtNnfRGahF5O6iBf62ItAmLkEAPSVsOSSbKps=; b=SkyoHWR3gpEhgDhCPYiTMrkIF+Pl1Gb8ZR7odIOn0iMd3pgRhLy7WcbJqdcyhPNnr/ TpKQshL6tNSH/bAeeTj2a4eTH3D57YO11pw+zNapqddde+9gGkAhTbj3ZenxMrMmT/KB 981tyQh5Ec8IEfE9C5k2jmzRizGH+S7c1vSmRMmseFhhci1YokQryUEnu4Ysvw/IN79r aUFUri48tptLiUIEy/+Gmap7slgqcj+E22pHhQoZ4hPsP1o7N5hMwvevTWRiBJzeYt9p 882NBazgawVRCsDo8idnW/jziFi/3Hmnnkr/bymPsrF/3ievWZWmKgTR1evi2EFg8+Tw G3nw== X-Gm-Message-State: AC+VfDy662e/wdQqGbvAOiPoewHAPHa7MkHqMtCJqLlE9i4C3PJcjMRm xn+3nUIEZjM930uemv/LL4VMNI5pogPp7gZtUgfXEz+50wd3pW7aV6xYUw== X-Google-Smtp-Source: ACHHUZ6OPOknfb+5uEcHTXt2X235qaXA5Rm9OsjcPSOROgv+biHgpokVEXUuUB1r0bUTJ6WYA72yDC8xEcxq X-Received: by 2002:a17:902:c950:b0:1b0:6480:1788 with SMTP id i16-20020a170902c95000b001b064801788mr2420631pla.61.1686348119698; Fri, 09 Jun 2023 15:01:59 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id c14-20020a63350e000000b0053b8c98d150sm350521pga.26.2023.06.09.15.01.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jun 2023 15:01:59 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Date: Fri, 09 Jun 2023 15:01:59 -0700 (PDT) Message-ID: <6483a157.630a0220.81b57.9445SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.2] (unknown [172.18.0.217]) by postal.iol.unh.edu (Postfix) with ESMTP id 2C1396052472; Fri, 9 Jun 2023 18:01:59 -0400 (EDT) Subject: |WARNING| pw128068-128069 [PATCH] [2/2] net/nfp: add default process to report outer L4 packet type From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu Content-Type: text/plain X-BeenThere: test-report@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: automatic DPDK test reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: test-report-bounces@dpdk.org Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/128068 _apply patch failure_ Submitter: Chaoyong He Date: Monday, June 05 2023 03:12:07 Applied on: CommitID:abaa473297cf21cb81e5348185a7694ae2f221e7 Apply patch set 128068-128069 failed: Checking patch drivers/net/nfp/nfp_rxtx.c... error: while searching for: if (nfp_tunnel_ptype != NFP_NET_PTYPE_TUNNEL_NONE) mbuf_ptype |= RTE_PTYPE_INNER_L2_ETHER; switch (nfp_tunnel_ptype) { case NFP_NET_PTYPE_TUNNEL_NONE: break; error: patch failed: drivers/net/nfp/nfp_rxtx.c:321 error: while searching for: NFP_NET_PTYPE_L3_OFFSET; nfp_ptype.tunnel_ptype = (rxd_ptype & NFP_NET_PTYPE_TUNNEL_MASK) >> NFP_NET_PTYPE_TUNNEL_OFFSET; nfp_net_set_ptype(&nfp_ptype, mb); } error: patch failed: drivers/net/nfp/nfp_rxtx.c:432 Checking patch drivers/net/nfp/nfp_rxtx.h... error: while searching for: * 1 0 * 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * | |tunnel | l3 | l4 | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * * Bit map about nfp packet type refers to the following: error: patch failed: drivers/net/nfp/nfp_rxtx.h:178 error: while searching for: * 0101: NFP_NET_PTYPE_TUNNEL_GENEVE * 0010, 0011, 0110~1111: reserved * * Reserved: bit 10~15, used for extension. */ error: patch failed: drivers/net/nfp/nfp_rxtx.h:210 error: while searching for: #define NFP_NET_PTYPE_L4_MASK 0x0007 #define NFP_NET_PTYPE_L3_MASK 0x0038 #define NFP_NET_PTYPE_TUNNEL_MASK 0x03c0 #define NFP_NET_PTYPE_L4_OFFSET 0 #define NFP_NET_PTYPE_L3_OFFSET 3 #define NFP_NET_PTYPE_TUNNEL_OFFSET 6 /* Case about nfp packet type based on the bit map above. */ #define NFP_NET_PTYPE_L4_NONE 0 error: patch failed: drivers/net/nfp/nfp_rxtx.h:217 error: while searching for: #define NFP_NET_PTYPE_TUNNEL_NVGRE 4 #define NFP_NET_PTYPE_TUNNEL_GENEVE 5 #define NFP_PTYPE2RTE(tunnel, type) ((tunnel) ? RTE_PTYPE_INNER_##type : RTE_PTYPE_##type) /* Record NFP packet type parsed from rxd.offload_info. */ struct nfp_ptype_parsed { uint8_t l4_ptype; /**< Packet type of layer 4, or inner layer 4. */ uint8_t l3_ptype; /**< Packet type of layer 3, or inner layer 3. */ uint8_t tunnel_ptype; /**< Packet type of tunnel. */ }; struct nfp_net_rx_desc { error: patch failed: drivers/net/nfp/nfp_rxtx.h:244 Applying patch drivers/net/nfp/nfp_rxtx.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applying patch drivers/net/nfp/nfp_rxtx.h with 4 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Rejected hunk #4. hint: Use 'git am --show-current-patch' to see the failed patch diff a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c (rejected hunks) @@ -321,6 +321,21 @@ nfp_net_set_ptype(const struct nfp_ptype_parsed *nfp_ptype, struct rte_mbuf *mb) if (nfp_tunnel_ptype != NFP_NET_PTYPE_TUNNEL_NONE) mbuf_ptype |= RTE_PTYPE_INNER_L2_ETHER; + switch (nfp_ptype->outer_l3_ptype) { + case NFP_NET_PTYPE_OUTER_L3_NONE: + break; + case NFP_NET_PTYPE_OUTER_L3_IPV4: + mbuf_ptype |= RTE_PTYPE_L3_IPV4; + break; + case NFP_NET_PTYPE_OUTER_L3_IPV6: + mbuf_ptype |= RTE_PTYPE_L3_IPV6; + break; + default: + PMD_RX_LOG(DEBUG, "Unrecognized nfp outer layer 3 packet type: %u", + nfp_ptype->outer_l3_ptype); + break; + } + switch (nfp_tunnel_ptype) { case NFP_NET_PTYPE_TUNNEL_NONE: break; @@ -432,6 +447,8 @@ nfp_net_parse_ptype(struct nfp_net_rx_desc *rxds, NFP_NET_PTYPE_L3_OFFSET; nfp_ptype.tunnel_ptype = (rxd_ptype & NFP_NET_PTYPE_TUNNEL_MASK) >> NFP_NET_PTYPE_TUNNEL_OFFSET; + nfp_ptype.outer_l3_ptype = (rxd_ptype & NFP_NET_PTYPE_OUTER_L3_MASK) >> + NFP_NET_PTYPE_OUTER_L3_OFFSET; nfp_net_set_ptype(&nfp_ptype, mb); } diff a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h (rejected hunks) @@ -178,7 +178,7 @@ struct nfp_net_txq { * 1 0 * 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | |tunnel | l3 | l4 | + * | |ol3|tunnel | l3 | l4 | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * * Bit map about nfp packet type refers to the following: @@ -210,6 +210,12 @@ struct nfp_net_txq { * 0101: NFP_NET_PTYPE_TUNNEL_GENEVE * 0010, 0011, 0110~1111: reserved * + * Outer L3: bit 10~11, used for outer layer 3. + * 00: NFP_NET_PTYPE_OUTER_L3_NONE + * 01: NFP_NET_PTYPE_OUTER_L3_IPV6 + * 10: NFP_NET_PTYPE_OUTER_L3_IPV4 + * 11: reserved + * * Reserved: bit 10~15, used for extension. */ @@ -217,10 +223,12 @@ struct nfp_net_txq { #define NFP_NET_PTYPE_L4_MASK 0x0007 #define NFP_NET_PTYPE_L3_MASK 0x0038 #define NFP_NET_PTYPE_TUNNEL_MASK 0x03c0 +#define NFP_NET_PTYPE_OUTER_L3_MASK 0x0c00 #define NFP_NET_PTYPE_L4_OFFSET 0 #define NFP_NET_PTYPE_L3_OFFSET 3 #define NFP_NET_PTYPE_TUNNEL_OFFSET 6 +#define NFP_NET_PTYPE_OUTER_L3_OFFSET 10 /* Case about nfp packet type based on the bit map above. */ #define NFP_NET_PTYPE_L4_NONE 0 @@ -244,13 +252,18 @@ struct nfp_net_txq { #define NFP_NET_PTYPE_TUNNEL_NVGRE 4 #define NFP_NET_PTYPE_TUNNEL_GENEVE 5 +#define NFP_NET_PTYPE_OUTER_L3_NONE 0 +#define NFP_NET_PTYPE_OUTER_L3_IPV6 1 +#define NFP_NET_PTYPE_OUTER_L3_IPV4 2 + #define NFP_PTYPE2RTE(tunnel, type) ((tunnel) ? RTE_PTYPE_INNER_##type : RTE_PTYPE_##type) /* Record NFP packet type parsed from rxd.offload_info. */ struct nfp_ptype_parsed { - uint8_t l4_ptype; /**< Packet type of layer 4, or inner layer 4. */ - uint8_t l3_ptype; /**< Packet type of layer 3, or inner layer 3. */ - uint8_t tunnel_ptype; /**< Packet type of tunnel. */ + uint8_t l4_ptype; /**< Packet type of layer 4, or inner layer 4. */ + uint8_t l3_ptype; /**< Packet type of layer 3, or inner layer 3. */ + uint8_t tunnel_ptype; /**< Packet type of tunnel. */ + uint8_t outer_l3_ptype; /**< Packet type of outer layer 3. */ }; struct nfp_net_rx_desc { Checking patch drivers/net/nfp/nfp_rxtx.c... error: while searching for: case NFP_NET_PTYPE_TUNNEL_NONE: break; case NFP_NET_PTYPE_TUNNEL_VXLAN: mbuf_ptype |= RTE_PTYPE_TUNNEL_VXLAN; break; case NFP_NET_PTYPE_TUNNEL_NVGRE: mbuf_ptype |= RTE_PTYPE_TUNNEL_NVGRE; break; case NFP_NET_PTYPE_TUNNEL_GENEVE: mbuf_ptype |= RTE_PTYPE_TUNNEL_GENEVE; break; default: PMD_RX_LOG(DEBUG, "Unrecognized nfp tunnel packet type: %u", error: patch failed: drivers/net/nfp/nfp_rxtx.c:340 Applying patch drivers/net/nfp/nfp_rxtx.c with 1 reject... Rejected hunk #1. hint: Use 'git am --show-current-patch' to see the failed patch diff a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c (rejected hunks) @@ -340,13 +340,13 @@ nfp_net_set_ptype(const struct nfp_ptype_parsed *nfp_ptype, struct rte_mbuf *mb) case NFP_NET_PTYPE_TUNNEL_NONE: break; case NFP_NET_PTYPE_TUNNEL_VXLAN: - mbuf_ptype |= RTE_PTYPE_TUNNEL_VXLAN; + mbuf_ptype |= RTE_PTYPE_TUNNEL_VXLAN | RTE_PTYPE_L4_UDP; break; case NFP_NET_PTYPE_TUNNEL_NVGRE: mbuf_ptype |= RTE_PTYPE_TUNNEL_NVGRE; break; case NFP_NET_PTYPE_TUNNEL_GENEVE: - mbuf_ptype |= RTE_PTYPE_TUNNEL_GENEVE; + mbuf_ptype |= RTE_PTYPE_TUNNEL_GENEVE | RTE_PTYPE_L4_UDP; break; default: PMD_RX_LOG(DEBUG, "Unrecognized nfp tunnel packet type: %u", https://lab.dpdk.org/results/dashboard/patchsets/26523/ UNH-IOL DPDK Community Lab