* |WARNING| pw127140-127144 [PATCH] [5/5] net/nfp: report packet type by Rx descriptor
@ 2023-05-22 8:20 dpdklab
0 siblings, 0 replies; only message in thread
From: dpdklab @ 2023-05-22 8:20 UTC (permalink / raw)
To: test-report; +Cc: dpdk-test-reports
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/127140
_apply patch failure_
Submitter: Chaoyong He <chaoyong.he@corigine.com>
Date: Monday, May 22 2023 08:05:00
Applied on: CommitID:a399d7b5a994e335c446d4b15d7622d71dd8848c
Apply patch set 127140-127144 failed:
Checking patch drivers/net/nfp/flower/nfp_flower.c...
Hunk #1 succeeded at 427 (offset -1 lines).
Checking patch drivers/net/nfp/nfp_rxtx.c...
Hunk #1 succeeded at 252 (offset 7 lines).
Checking patch drivers/net/nfp/nfp_rxtx.h...
error: while searching for:
struct nfp_net_rx_desc {
union {
/* Freelist descriptor */
struct {
uint16_t dma_addr_hi;
uint8_t spare;
uint8_t dd;
uint32_t dma_addr_lo;
} __rte_packed fld;
/* RX descriptor */
struct {
uint16_t data_len;
uint8_t reserved;
uint8_t meta_len_dd;
uint16_t flags;
uint16_t vlan;
} __rte_packed rxd;
uint32_t vals[2];
};
};
error: patch failed: drivers/net/nfp/nfp_rxtx.h:172
Applied patch drivers/net/nfp/flower/nfp_flower.c cleanly.
Applied patch drivers/net/nfp/nfp_rxtx.c cleanly.
Applying patch drivers/net/nfp/nfp_rxtx.h 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.h b/drivers/net/nfp/nfp_rxtx.h (rejected hunks)
@@ -172,25 +172,25 @@ struct nfp_net_txq {
struct nfp_net_rx_desc {
union {
- /* Freelist descriptor */
+ /** Freelist descriptor. */
struct {
- uint16_t dma_addr_hi;
- uint8_t spare;
- uint8_t dd;
-
- uint32_t dma_addr_lo;
+ uint16_t dma_addr_hi; /**< High bits of buffer address. */
+ uint8_t spare; /**< Reserved, must be zero. */
+ uint8_t dd; /**< Whether descriptor available. */
+ uint32_t dma_addr_lo; /**< Low bits of buffer address. */
} __rte_packed fld;
- /* RX descriptor */
+ /** RX descriptor. */
struct {
- uint16_t data_len;
- uint8_t reserved;
- uint8_t meta_len_dd;
+ uint16_t data_len; /**< Length of frame + metadata. */
+ uint8_t reserved; /**< Reserved, must be zero. */
+ uint8_t meta_len_dd; /**< Length of metadata + done flag. */
- uint16_t flags;
- uint16_t vlan;
+ uint16_t flags; /**< RX flags. */
+ uint16_t offload_info; /**< Offloading info. */
} __rte_packed rxd;
+ /** Reserved. */
uint32_t vals[2];
};
};
Checking patch drivers/net/nfp/nfp_rxtx.c...
error: drivers/net/nfp/nfp_rxtx.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch drivers/net/nfp/nfp_common.c...
Hunk #1 succeeded at 191 (offset -110 lines).
Checking patch drivers/net/nfp/nfp_common.h...
Hunk #1 succeeded at 427 (offset 4 lines).
Checking patch drivers/net/nfp/nfp_ctrl.h...
Hunk #1 succeeded at 224 (offset 10 lines).
Checking patch drivers/net/nfp/nfp_ethdev.c...
Hunk #1 succeeded at 64 (offset 7 lines).
Hunk #2 succeeded at 156 (offset 7 lines).
Checking patch drivers/net/nfp/nfp_rxtx.c...
error: drivers/net/nfp/nfp_rxtx.c: does not match index
Checking patch drivers/net/nfp/nfp_rxtx.h...
error: while searching for:
#define PCIE_DESC_RX_L4_CSUM_OK (PCIE_DESC_RX_TCP_CSUM_OK | \
PCIE_DESC_RX_UDP_CSUM_OK)
struct nfp_net_rx_desc {
union {
/** Freelist descriptor. */
error: patch failed: drivers/net/nfp/nfp_rxtx.h:170
Applied patch drivers/net/nfp/nfp_common.c cleanly.
Applied patch drivers/net/nfp/nfp_common.h cleanly.
Applied patch drivers/net/nfp/nfp_ctrl.h cleanly.
Applied patch drivers/net/nfp/nfp_ethdev.c cleanly.
Applying patch drivers/net/nfp/nfp_rxtx.h 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.h b/drivers/net/nfp/nfp_rxtx.h (rejected hunks)
@@ -170,6 +170,89 @@ struct nfp_net_txq {
#define PCIE_DESC_RX_L4_CSUM_OK (PCIE_DESC_RX_TCP_CSUM_OK | \
PCIE_DESC_RX_UDP_CSUM_OK)
+/*
+ * The bit format and map of nfp packet type for rxd.offload_info in Rx descriptor.
+ *
+ * Bit format about nfp packet type refers to the following:
+ * ---------------------------------
+ * 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:
+ *
+ * L4: bit 0~2, used for layer 4 or inner layer 4.
+ * 000: NFP_NET_PTYPE_L4_NONE
+ * 001: NFP_NET_PTYPE_L4_TCP
+ * 010: NFP_NET_PTYPE_L4_UDP
+ * 011: NFP_NET_PTYPE_L4_FRAG
+ * 100: NFP_NET_PTYPE_L4_NONFRAG
+ * 101: NFP_NET_PTYPE_L4_ICMP
+ * 110: NFP_NET_PTYPE_L4_SCTP
+ * 111: reserved
+ *
+ * L3: bit 3~5, used for layer 3 or inner layer 3.
+ * 000: NFP_NET_PTYPE_L3_NONE
+ * 001: NFP_NET_PTYPE_L3_IPV6
+ * 010: NFP_NET_PTYPE_L3_IPV4
+ * 011: NFP_NET_PTYPE_L3_IPV4_EXT
+ * 100: NFP_NET_PTYPE_L3_IPV6_EXT
+ * 101: NFP_NET_PTYPE_L3_IPV4_EXT_UNKNOWN
+ * 110: NFP_NET_PTYPE_L3_IPV6_EXT_UNKNOWN
+ * 111: reserved
+ *
+ * Tunnel: bit 6~9, used for tunnel.
+ * 0000: NFP_NET_PTYPE_TUNNEL_NONE
+ * 0001: NFP_NET_PTYPE_TUNNEL_VXLAN
+ * 0100: NFP_NET_PTYPE_TUNNEL_NVGRE
+ * 0101: NFP_NET_PTYPE_TUNNEL_GENEVE
+ * 0010, 0011, 0110~1111: reserved
+ *
+ * Reserved: bit 10~15, used for extension.
+ */
+
+/* Mask and offset about nfp packet type based on the bit map above. */
+#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
+#define NFP_NET_PTYPE_L4_TCP 1
+#define NFP_NET_PTYPE_L4_UDP 2
+#define NFP_NET_PTYPE_L4_FRAG 3
+#define NFP_NET_PTYPE_L4_NONFRAG 4
+#define NFP_NET_PTYPE_L4_ICMP 5
+#define NFP_NET_PTYPE_L4_SCTP 6
+
+#define NFP_NET_PTYPE_L3_NONE 0
+#define NFP_NET_PTYPE_L3_IPV6 1
+#define NFP_NET_PTYPE_L3_IPV4 2
+#define NFP_NET_PTYPE_L3_IPV4_EXT 3
+#define NFP_NET_PTYPE_L3_IPV6_EXT 4
+#define NFP_NET_PTYPE_L3_IPV4_EXT_UNKNOWN 5
+#define NFP_NET_PTYPE_L3_IPV6_EXT_UNKNOWN 6
+
+#define NFP_NET_PTYPE_TUNNEL_NONE 0
+#define NFP_NET_PTYPE_TUNNEL_VXLAN 1
+#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 {
union {
/** Freelist descriptor. */
https://lab.dpdk.org/results/dashboard/patchsets/26322/
UNH-IOL DPDK Community Lab
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-22 8:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-22 8:20 |WARNING| pw127140-127144 [PATCH] [5/5] net/nfp: report packet type by Rx descriptor dpdklab
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).