From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw128068-128069 [PATCH] [2/2] net/nfp: add default process to report outer L4 packet type
Date: Sat, 10 Jun 2023 10:57:07 -0700 (PDT) [thread overview]
Message-ID: <6484b973.170a0220.8cf8c.371cSMTPIN_ADDED_MISSING@mx.google.com> (raw)
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/128068
_apply patch failure_
Submitter: Chaoyong He <chaoyong.he@corigine.com>
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
next reply other threads:[~2023-06-10 17:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-10 17:57 dpdklab [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-09 22:01 dpdklab
2023-06-05 3:30 dpdklab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6484b973.170a0220.8cf8c.371cSMTPIN_ADDED_MISSING@mx.google.com \
--to=dpdklab@iol.unh.edu \
--cc=dpdk-test-reports@iol.unh.edu \
--cc=test-report@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).