git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mbuf: add rte prefix to offload flags
[dpdk.git] / drivers / net / iavf / iavf_rxtx_vec_avx512.c
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
index 571161c..cc8542b 100644 (file)
--- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
@@ -431,8 +431,12 @@ _iavf_recv_raw_pkts_vec_avx512(struct iavf_rx_queue *rxq,
                         * destination
                         */
                        const __m256i vlan_flags_shuf =
-                               _mm256_set_epi32(0, 0, PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED, 0,
-                                                0, 0, PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED, 0);
+                               _mm256_set_epi32(0, 0,
+                                                RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED,
+                                                0,
+                                                0, 0,
+                                                RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED,
+                                                0);
 #endif
 
 #ifdef IAVF_RX_RSS_OFFLOAD
@@ -443,11 +447,16 @@ _iavf_recv_raw_pkts_vec_avx512(struct iavf_rx_queue *rxq,
                         */
                        const __m256i rss_flags_shuf =
                                _mm256_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,
-                                               PKT_RX_RSS_HASH | PKT_RX_FDIR, PKT_RX_RSS_HASH,
-                                               0, 0, 0, 0, PKT_RX_FDIR, 0,/* end up 128-bits */
+                                               RTE_MBUF_F_RX_RSS_HASH | RTE_MBUF_F_RX_FDIR,
+                                               RTE_MBUF_F_RX_RSS_HASH,
+                                               0, 0, 0, 0,
+                                               RTE_MBUF_F_RX_FDIR, 0,
+                                               /* end up 128-bits */
                                                0, 0, 0, 0, 0, 0, 0, 0,
-                                               PKT_RX_RSS_HASH | PKT_RX_FDIR, PKT_RX_RSS_HASH,
-                                               0, 0, 0, 0, PKT_RX_FDIR, 0);
+                                               RTE_MBUF_F_RX_RSS_HASH | RTE_MBUF_F_RX_FDIR,
+                                               RTE_MBUF_F_RX_RSS_HASH,
+                                               0, 0, 0, 0,
+                                               RTE_MBUF_F_RX_FDIR, 0);
 #endif
 
 #ifdef IAVF_RX_CSUM_OFFLOAD
@@ -457,33 +466,33 @@ _iavf_recv_raw_pkts_vec_avx512(struct iavf_rx_queue *rxq,
                         */
                        const __m256i l3_l4_flags_shuf = _mm256_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,
                                        /* shift right 1 bit to make sure it not exceed 255 */
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
-                                        PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_OUTER_IP_CKSUM_BAD |
-                                        PKT_RX_L4_CKSUM_BAD) >> 1,
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_OUTER_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD) >> 1,
-                                       PKT_RX_IP_CKSUM_BAD >> 1,
-                                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD) >> 1,
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_L4_CKSUM_BAD |
+                                        RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD |
+                                        RTE_MBUF_F_RX_L4_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_L4_CKSUM_BAD | RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_BAD) >> 1,
+                                       RTE_MBUF_F_RX_IP_CKSUM_BAD >> 1,
+                                       (RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD) >> 1,
                                        /* second 128-bits */
                                        0, 0, 0, 0, 0, 0, 0, 0,
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
-                                        PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_OUTER_IP_CKSUM_BAD |
-                                        PKT_RX_L4_CKSUM_BAD) >> 1,
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_OUTER_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD) >> 1,
-                                       PKT_RX_IP_CKSUM_BAD >> 1,
-                                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD) >> 1);
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_L4_CKSUM_BAD |
+                                        RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD |
+                                        RTE_MBUF_F_RX_L4_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_L4_CKSUM_BAD | RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_BAD) >> 1,
+                                       RTE_MBUF_F_RX_IP_CKSUM_BAD >> 1,
+                                       (RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD) >> 1);
 
                        const __m256i cksum_mask =
-                               _mm256_set1_epi32(PKT_RX_IP_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD |
-                                                 PKT_RX_L4_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD |
-                                                 PKT_RX_OUTER_IP_CKSUM_BAD);
+                               _mm256_set1_epi32(RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_IP_CKSUM_BAD |
+                                                 RTE_MBUF_F_RX_L4_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_BAD |
+                                                 RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD);
 #endif
 
 #if defined(IAVF_RX_CSUM_OFFLOAD) || defined(IAVF_RX_VLAN_OFFLOAD) || defined(IAVF_RX_RSS_OFFLOAD)
@@ -688,10 +697,10 @@ static __rte_always_inline __m256i
 flex_rxd_to_fdir_flags_vec_avx512(const __m256i fdir_id0_7)
 {
 #define FDID_MIS_MAGIC 0xFFFFFFFF
-       RTE_BUILD_BUG_ON(PKT_RX_FDIR != (1 << 2));
-       RTE_BUILD_BUG_ON(PKT_RX_FDIR_ID != (1 << 13));
-       const __m256i pkt_fdir_bit = _mm256_set1_epi32(PKT_RX_FDIR |
-                                                      PKT_RX_FDIR_ID);
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_RX_FDIR != (1 << 2));
+       RTE_BUILD_BUG_ON(RTE_MBUF_F_RX_FDIR_ID != (1 << 13));
+       const __m256i pkt_fdir_bit = _mm256_set1_epi32(RTE_MBUF_F_RX_FDIR |
+                                                      RTE_MBUF_F_RX_FDIR_ID);
        /* desc->flow_id field == 0xFFFFFFFF means fdir mismatch */
        const __m256i fdir_mis_mask = _mm256_set1_epi32(FDID_MIS_MAGIC);
        __m256i fdir_mask = _mm256_cmpeq_epi32(fdir_id0_7,
@@ -974,36 +983,36 @@ _iavf_recv_raw_pkts_vec_avx512_flex_rxd(struct iavf_rx_queue *rxq,
                         */
                        const __m256i l3_l4_flags_shuf = _mm256_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,
                                        /* shift right 1 bit to make sure it not exceed 255 */
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
-                                        PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
-                                        PKT_RX_IP_CKSUM_GOOD) >> 1,
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |
-                                        PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |
-                                        PKT_RX_IP_CKSUM_GOOD) >> 1,
-                                       (PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1,
-                                       (PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >> 1,
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_L4_CKSUM_BAD |
+                                        RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_L4_CKSUM_BAD |
+                                        RTE_MBUF_F_RX_IP_CKSUM_GOOD) >> 1,
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_L4_CKSUM_GOOD |
+                                        RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_L4_CKSUM_GOOD |
+                                        RTE_MBUF_F_RX_IP_CKSUM_GOOD) >> 1,
+                                       (RTE_MBUF_F_RX_L4_CKSUM_BAD | RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_L4_CKSUM_BAD | RTE_MBUF_F_RX_IP_CKSUM_GOOD) >> 1,
+                                       (RTE_MBUF_F_RX_L4_CKSUM_GOOD | RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_L4_CKSUM_GOOD | RTE_MBUF_F_RX_IP_CKSUM_GOOD) >> 1,
                                        /* second 128-bits */
                                        0, 0, 0, 0, 0, 0, 0, 0,
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
-                                        PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
-                                        PKT_RX_IP_CKSUM_GOOD) >> 1,
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |
-                                        PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |
-                                        PKT_RX_IP_CKSUM_GOOD) >> 1,
-                                       (PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1,
-                                       (PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1,
-                                       (PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >> 1);
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_L4_CKSUM_BAD |
+                                        RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_L4_CKSUM_BAD |
+                                        RTE_MBUF_F_RX_IP_CKSUM_GOOD) >> 1,
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_L4_CKSUM_GOOD |
+                                        RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD | RTE_MBUF_F_RX_L4_CKSUM_GOOD |
+                                        RTE_MBUF_F_RX_IP_CKSUM_GOOD) >> 1,
+                                       (RTE_MBUF_F_RX_L4_CKSUM_BAD | RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_L4_CKSUM_BAD | RTE_MBUF_F_RX_IP_CKSUM_GOOD) >> 1,
+                                       (RTE_MBUF_F_RX_L4_CKSUM_GOOD | RTE_MBUF_F_RX_IP_CKSUM_BAD) >> 1,
+                                       (RTE_MBUF_F_RX_L4_CKSUM_GOOD | RTE_MBUF_F_RX_IP_CKSUM_GOOD) >> 1);
                        const __m256i cksum_mask =
-                               _mm256_set1_epi32(PKT_RX_IP_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD |
-                                                 PKT_RX_L4_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD |
-                                                 PKT_RX_OUTER_IP_CKSUM_BAD);
+                               _mm256_set1_epi32(RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_IP_CKSUM_BAD |
+                                                 RTE_MBUF_F_RX_L4_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_BAD |
+                                                 RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD);
 #endif
 #if defined(IAVF_RX_VLAN_OFFLOAD) || defined(IAVF_RX_RSS_OFFLOAD)
                        /**
@@ -1015,28 +1024,28 @@ _iavf_recv_raw_pkts_vec_avx512_flex_rxd(struct iavf_rx_queue *rxq,
                                        (0, 0, 0, 0,
                                         0, 0, 0, 0,
                                         0, 0, 0, 0,
-                                        PKT_RX_RSS_HASH, 0,
-                                        PKT_RX_RSS_HASH, 0,
+                                        RTE_MBUF_F_RX_RSS_HASH, 0,
+                                        RTE_MBUF_F_RX_RSS_HASH, 0,
                                         /* end up 128-bits */
                                         0, 0, 0, 0,
                                         0, 0, 0, 0,
                                         0, 0, 0, 0,
-                                        PKT_RX_RSS_HASH, 0,
-                                        PKT_RX_RSS_HASH, 0);
+                                        RTE_MBUF_F_RX_RSS_HASH, 0,
+                                        RTE_MBUF_F_RX_RSS_HASH, 0);
 
                        const __m256i vlan_flags_shuf = _mm256_set_epi8
                                        (0, 0, 0, 0,
                                         0, 0, 0, 0,
                                         0, 0, 0, 0,
-                                        PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
-                                        PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
+                                        RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED,
+                                        RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED,
                                         0, 0,
                                         /* end up 128-bits */
                                         0, 0, 0, 0,
                                         0, 0, 0, 0,
                                         0, 0, 0, 0,
-                                        PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
-                                        PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
+                                        RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED,
+                                        RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED,
                                         0, 0);
 #endif
 
@@ -1273,8 +1282,8 @@ _iavf_recv_raw_pkts_vec_avx512_flex_rxd(struct iavf_rx_queue *rxq,
                                                         0, 0, 0, 0,
                                                         0, 0, 0, 0,
                                                         0, 0,
-                                                        PKT_RX_VLAN |
-                                                        PKT_RX_VLAN_STRIPPED,
+                                                        RTE_MBUF_F_RX_VLAN |
+                                                        RTE_MBUF_F_RX_VLAN_STRIPPED,
                                                         0);
 
                                        vlan_flags =
DPDK repo used for reviews