7f83738b46
0001 ~ 0014 patches are for virtual channel and PMD 0015 is the iavf fdir framework 0016 ~ 0017 are for the iavf fidr driver Type: feature Signed-off-by: Chenmin Sun <chenmin.sun@intel.com> Change-Id: I38e69ca0065a71cc6ba0b44ef7c7db51193a0899
114 lines
3.4 KiB
Diff
114 lines
3.4 KiB
Diff
From 8aa451f16a44c4d278e38991b0c24e89a5a9aff2 Mon Sep 17 00:00:00 2001
|
|
From: Leyi Rong <leyi.rong@intel.com>
|
|
Date: Wed, 8 Apr 2020 14:22:06 +0800
|
|
Subject: [DPDK 12/17] net/iavf: support flow mark in normal data path
|
|
|
|
Support Flow Director mark ID parsing in normal path.
|
|
|
|
Signed-off-by: Leyi Rong <leyi.rong@intel.com>
|
|
---
|
|
drivers/net/iavf/iavf.h | 3 +++
|
|
drivers/net/iavf/iavf_rxtx.c | 37 ++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 40 insertions(+)
|
|
|
|
diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
|
|
index 0cd0117c2..b63efd4e8 100644
|
|
--- a/drivers/net/iavf/iavf.h
|
|
+++ b/drivers/net/iavf/iavf.h
|
|
@@ -67,6 +67,9 @@
|
|
#define IAVF_48_BIT_WIDTH (CHAR_BIT * 6)
|
|
#define IAVF_48_BIT_MASK RTE_LEN2MASK(IAVF_48_BIT_WIDTH, uint64_t)
|
|
|
|
+#define IAVF_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03
|
|
+#define IAVF_RX_DESC_EXT_STATUS_FLEXBH_FD_ID 0x01
|
|
+
|
|
struct iavf_adapter;
|
|
struct iavf_rx_queue;
|
|
struct iavf_tx_queue;
|
|
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
|
|
index 34c41d104..ca47c6ab6 100644
|
|
--- a/drivers/net/iavf/iavf_rxtx.c
|
|
+++ b/drivers/net/iavf/iavf_rxtx.c
|
|
@@ -756,6 +756,10 @@ iavf_rxd_to_pkt_flags(uint64_t qword)
|
|
IAVF_RX_DESC_FLTSTAT_RSS_HASH) ==
|
|
IAVF_RX_DESC_FLTSTAT_RSS_HASH) ? PKT_RX_RSS_HASH : 0;
|
|
|
|
+ /* Check if FDIR Match */
|
|
+ flags |= (qword & (1 << IAVF_RX_DESC_STATUS_FLM_SHIFT) ?
|
|
+ PKT_RX_FDIR : 0);
|
|
+
|
|
if (likely((error_bits & IAVF_RX_ERR_BITS) == 0)) {
|
|
flags |= (PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD);
|
|
return flags;
|
|
@@ -776,6 +780,25 @@ iavf_rxd_to_pkt_flags(uint64_t qword)
|
|
return flags;
|
|
}
|
|
|
|
+static inline uint64_t
|
|
+iavf_rxd_build_fdir(volatile union iavf_rx_desc *rxdp, struct rte_mbuf *mb)
|
|
+{
|
|
+ uint64_t flags = 0;
|
|
+ uint16_t flexbh;
|
|
+
|
|
+ flexbh = (rte_le_to_cpu_32(rxdp->wb.qword2.ext_status) >>
|
|
+ IAVF_RX_DESC_EXT_STATUS_FLEXBH_SHIFT) &
|
|
+ IAVF_RX_DESC_EXT_STATUS_FLEXBH_MASK;
|
|
+
|
|
+ if (flexbh == IAVF_RX_DESC_EXT_STATUS_FLEXBH_FD_ID) {
|
|
+ mb->hash.fdir.hi =
|
|
+ rte_le_to_cpu_32(rxdp->wb.qword3.hi_dword.fd_id);
|
|
+ flags |= PKT_RX_FDIR_ID;
|
|
+ }
|
|
+
|
|
+ return flags;
|
|
+}
|
|
+
|
|
/* Translate the rx flex descriptor status to pkt flags */
|
|
static inline void
|
|
iavf_rxd_to_pkt_fields(struct rte_mbuf *mb,
|
|
@@ -792,6 +815,11 @@ iavf_rxd_to_pkt_fields(struct rte_mbuf *mb,
|
|
mb->hash.rss = rte_le_to_cpu_32(desc->rss_hash);
|
|
}
|
|
#endif
|
|
+
|
|
+ if (desc->flow_id != 0xFFFFFFFF) {
|
|
+ mb->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
|
|
+ mb->hash.fdir.hi = rte_le_to_cpu_32(desc->flow_id);
|
|
+ }
|
|
}
|
|
|
|
#define IAVF_RX_FLEX_ERR0_BITS \
|
|
@@ -951,6 +979,9 @@ iavf_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
|
|
rxm->hash.rss =
|
|
rte_le_to_cpu_32(rxd.wb.qword0.hi_dword.rss);
|
|
|
|
+ if (pkt_flags & PKT_RX_FDIR)
|
|
+ pkt_flags |= iavf_rxd_build_fdir(&rxd, rxm);
|
|
+
|
|
rxm->ol_flags |= pkt_flags;
|
|
|
|
rx_pkts[nb_rx++] = rxm;
|
|
@@ -1349,6 +1380,9 @@ iavf_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
|
|
first_seg->hash.rss =
|
|
rte_le_to_cpu_32(rxd.wb.qword0.hi_dword.rss);
|
|
|
|
+ if (pkt_flags & PKT_RX_FDIR)
|
|
+ pkt_flags |= iavf_rxd_build_fdir(&rxd, first_seg);
|
|
+
|
|
first_seg->ol_flags |= pkt_flags;
|
|
|
|
/* Prefetch data of first segment, if configured to do so. */
|
|
@@ -1515,6 +1549,9 @@ iavf_rx_scan_hw_ring(struct iavf_rx_queue *rxq)
|
|
mb->hash.rss = rte_le_to_cpu_32(
|
|
rxdp[j].wb.qword0.hi_dword.rss);
|
|
|
|
+ if (pkt_flags & PKT_RX_FDIR)
|
|
+ pkt_flags |= iavf_rxd_build_fdir(&rxdp[j], mb);
|
|
+
|
|
mb->ol_flags |= pkt_flags;
|
|
}
|
|
|
|
--
|
|
2.17.1
|
|
|