1 From 8aa451f16a44c4d278e38991b0c24e89a5a9aff2 Mon Sep 17 00:00:00 2001
2 From: Leyi Rong <leyi.rong@intel.com>
3 Date: Wed, 8 Apr 2020 14:22:06 +0800
4 Subject: [DPDK 12/17] net/iavf: support flow mark in normal data path
6 Support Flow Director mark ID parsing in normal path.
8 Signed-off-by: Leyi Rong <leyi.rong@intel.com>
10 drivers/net/iavf/iavf.h | 3 +++
11 drivers/net/iavf/iavf_rxtx.c | 37 ++++++++++++++++++++++++++++++++++++
12 2 files changed, 40 insertions(+)
14 diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
15 index 0cd0117c2..b63efd4e8 100644
16 --- a/drivers/net/iavf/iavf.h
17 +++ b/drivers/net/iavf/iavf.h
19 #define IAVF_48_BIT_WIDTH (CHAR_BIT * 6)
20 #define IAVF_48_BIT_MASK RTE_LEN2MASK(IAVF_48_BIT_WIDTH, uint64_t)
22 +#define IAVF_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03
23 +#define IAVF_RX_DESC_EXT_STATUS_FLEXBH_FD_ID 0x01
28 diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
29 index 34c41d104..ca47c6ab6 100644
30 --- a/drivers/net/iavf/iavf_rxtx.c
31 +++ b/drivers/net/iavf/iavf_rxtx.c
32 @@ -756,6 +756,10 @@ iavf_rxd_to_pkt_flags(uint64_t qword)
33 IAVF_RX_DESC_FLTSTAT_RSS_HASH) ==
34 IAVF_RX_DESC_FLTSTAT_RSS_HASH) ? PKT_RX_RSS_HASH : 0;
36 + /* Check if FDIR Match */
37 + flags |= (qword & (1 << IAVF_RX_DESC_STATUS_FLM_SHIFT) ?
40 if (likely((error_bits & IAVF_RX_ERR_BITS) == 0)) {
41 flags |= (PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD);
43 @@ -776,6 +780,25 @@ iavf_rxd_to_pkt_flags(uint64_t qword)
47 +static inline uint64_t
48 +iavf_rxd_build_fdir(volatile union iavf_rx_desc *rxdp, struct rte_mbuf *mb)
53 + flexbh = (rte_le_to_cpu_32(rxdp->wb.qword2.ext_status) >>
54 + IAVF_RX_DESC_EXT_STATUS_FLEXBH_SHIFT) &
55 + IAVF_RX_DESC_EXT_STATUS_FLEXBH_MASK;
57 + if (flexbh == IAVF_RX_DESC_EXT_STATUS_FLEXBH_FD_ID) {
59 + rte_le_to_cpu_32(rxdp->wb.qword3.hi_dword.fd_id);
60 + flags |= PKT_RX_FDIR_ID;
66 /* Translate the rx flex descriptor status to pkt flags */
68 iavf_rxd_to_pkt_fields(struct rte_mbuf *mb,
69 @@ -792,6 +815,11 @@ iavf_rxd_to_pkt_fields(struct rte_mbuf *mb,
70 mb->hash.rss = rte_le_to_cpu_32(desc->rss_hash);
74 + if (desc->flow_id != 0xFFFFFFFF) {
75 + mb->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
76 + mb->hash.fdir.hi = rte_le_to_cpu_32(desc->flow_id);
80 #define IAVF_RX_FLEX_ERR0_BITS \
81 @@ -951,6 +979,9 @@ iavf_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
83 rte_le_to_cpu_32(rxd.wb.qword0.hi_dword.rss);
85 + if (pkt_flags & PKT_RX_FDIR)
86 + pkt_flags |= iavf_rxd_build_fdir(&rxd, rxm);
88 rxm->ol_flags |= pkt_flags;
90 rx_pkts[nb_rx++] = rxm;
91 @@ -1349,6 +1380,9 @@ iavf_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
93 rte_le_to_cpu_32(rxd.wb.qword0.hi_dword.rss);
95 + if (pkt_flags & PKT_RX_FDIR)
96 + pkt_flags |= iavf_rxd_build_fdir(&rxd, first_seg);
98 first_seg->ol_flags |= pkt_flags;
100 /* Prefetch data of first segment, if configured to do so. */
101 @@ -1515,6 +1549,9 @@ iavf_rx_scan_hw_ring(struct iavf_rx_queue *rxq)
102 mb->hash.rss = rte_le_to_cpu_32(
103 rxdp[j].wb.qword0.hi_dword.rss);
105 + if (pkt_flags & PKT_RX_FDIR)
106 + pkt_flags |= iavf_rxd_build_fdir(&rxdp[j], mb);
108 mb->ol_flags |= pkt_flags;