ethdev: add namespace
[dpdk.git] / drivers / net / iavf / iavf_rxtx_vec_avx2.c
index e5e0fd3..b47c51b 100644 (file)
 
 #include "iavf_rxtx_vec_common.h"
 
-#include <x86intrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
 #endif
 
-static inline void
+static __rte_always_inline void
 iavf_rxq_rearm(struct iavf_rx_queue *rxq)
 {
-       int i;
-       uint16_t rx_id;
-       volatile union iavf_rx_desc *rxdp;
-       struct rte_mbuf **rxp = &rxq->sw_ring[rxq->rxrearm_start];
-
-       rxdp = rxq->rx_ring + rxq->rxrearm_start;
-
-       /* Pull 'n' more MBUFs into the software ring */
-       if (rte_mempool_get_bulk(rxq->mp,
-                                (void *)rxp,
-                                IAVF_RXQ_REARM_THRESH) < 0) {
-               if (rxq->rxrearm_nb + IAVF_RXQ_REARM_THRESH >=
-                   rxq->nb_rx_desc) {
-                       __m128i dma_addr0;
-
-                       dma_addr0 = _mm_setzero_si128();
-                       for (i = 0; i < IAVF_VPMD_DESCS_PER_LOOP; i++) {
-                               rxp[i] = &rxq->fake_mbuf;
-                               _mm_store_si128((__m128i *)&rxdp[i].read,
-                                               dma_addr0);
-                       }
-               }
-               rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed +=
-                       IAVF_RXQ_REARM_THRESH;
-               return;
-       }
-
-#ifndef RTE_LIBRTE_IAVF_16BYTE_RX_DESC
-       struct rte_mbuf *mb0, *mb1;
-       __m128i dma_addr0, dma_addr1;
-       __m128i hdr_room = _mm_set_epi64x(RTE_PKTMBUF_HEADROOM,
-                       RTE_PKTMBUF_HEADROOM);
-       /* Initialize the mbufs in vector, process 2 mbufs in one loop */
-       for (i = 0; i < IAVF_RXQ_REARM_THRESH; i += 2, rxp += 2) {
-               __m128i vaddr0, vaddr1;
-
-               mb0 = rxp[0];
-               mb1 = rxp[1];
-
-               /* load buf_addr(lo 64bit) and buf_physaddr(hi 64bit) */
-               RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, buf_physaddr) !=
-                               offsetof(struct rte_mbuf, buf_addr) + 8);
-               vaddr0 = _mm_loadu_si128((__m128i *)&mb0->buf_addr);
-               vaddr1 = _mm_loadu_si128((__m128i *)&mb1->buf_addr);
-
-               /* convert pa to dma_addr hdr/data */
-               dma_addr0 = _mm_unpackhi_epi64(vaddr0, vaddr0);
-               dma_addr1 = _mm_unpackhi_epi64(vaddr1, vaddr1);
-
-               /* add headroom to pa values */
-               dma_addr0 = _mm_add_epi64(dma_addr0, hdr_room);
-               dma_addr1 = _mm_add_epi64(dma_addr1, hdr_room);
-
-               /* flush desc with pa dma_addr */
-               _mm_store_si128((__m128i *)&rxdp++->read, dma_addr0);
-               _mm_store_si128((__m128i *)&rxdp++->read, dma_addr1);
-       }
-#else
-       struct rte_mbuf *mb0, *mb1, *mb2, *mb3;
-       __m256i dma_addr0_1, dma_addr2_3;
-       __m256i hdr_room = _mm256_set1_epi64x(RTE_PKTMBUF_HEADROOM);
-       /* Initialize the mbufs in vector, process 4 mbufs in one loop */
-       for (i = 0; i < IAVF_RXQ_REARM_THRESH;
-                       i += 4, rxp += 4, rxdp += 4) {
-               __m128i vaddr0, vaddr1, vaddr2, vaddr3;
-               __m256i vaddr0_1, vaddr2_3;
-
-               mb0 = rxp[0];
-               mb1 = rxp[1];
-               mb2 = rxp[2];
-               mb3 = rxp[3];
-
-               /* load buf_addr(lo 64bit) and buf_physaddr(hi 64bit) */
-               RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, buf_physaddr) !=
-                               offsetof(struct rte_mbuf, buf_addr) + 8);
-               vaddr0 = _mm_loadu_si128((__m128i *)&mb0->buf_addr);
-               vaddr1 = _mm_loadu_si128((__m128i *)&mb1->buf_addr);
-               vaddr2 = _mm_loadu_si128((__m128i *)&mb2->buf_addr);
-               vaddr3 = _mm_loadu_si128((__m128i *)&mb3->buf_addr);
-
-               /**
-                * merge 0 & 1, by casting 0 to 256-bit and inserting 1
-                * into the high lanes. Similarly for 2 & 3
-                */
-               vaddr0_1 =
-                       _mm256_inserti128_si256(_mm256_castsi128_si256(vaddr0),
-                                               vaddr1, 1);
-               vaddr2_3 =
-                       _mm256_inserti128_si256(_mm256_castsi128_si256(vaddr2),
-                                               vaddr3, 1);
-
-               /* convert pa to dma_addr hdr/data */
-               dma_addr0_1 = _mm256_unpackhi_epi64(vaddr0_1, vaddr0_1);
-               dma_addr2_3 = _mm256_unpackhi_epi64(vaddr2_3, vaddr2_3);
-
-               /* add headroom to pa values */
-               dma_addr0_1 = _mm256_add_epi64(dma_addr0_1, hdr_room);
-               dma_addr2_3 = _mm256_add_epi64(dma_addr2_3, hdr_room);
-
-               /* flush desc with pa dma_addr */
-               _mm256_store_si256((__m256i *)&rxdp->read, dma_addr0_1);
-               _mm256_store_si256((__m256i *)&(rxdp + 2)->read, dma_addr2_3);
-       }
-
-#endif
-
-       rxq->rxrearm_start += IAVF_RXQ_REARM_THRESH;
-       if (rxq->rxrearm_start >= rxq->nb_rx_desc)
-               rxq->rxrearm_start = 0;
-
-       rxq->rxrearm_nb -= IAVF_RXQ_REARM_THRESH;
-
-       rx_id = (uint16_t)((rxq->rxrearm_start == 0) ?
-                            (rxq->nb_rx_desc - 1) : (rxq->rxrearm_start - 1));
-
-       /* Update the tail pointer on the NIC */
-       IAVF_PCI_REG_WRITE(rxq->qrx_tail, rx_id);
+       return iavf_rxq_rearm_common(rxq, false);
 }
 
 #define PKTLEN_SHIFT     10
@@ -264,24 +148,24 @@ _iavf_recv_raw_pkts_vec_avx2(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_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
+                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
                         PKT_RX_IP_CKSUM_BAD) >> 1,
-                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_EIP_CKSUM_BAD |
+                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_OUTER_IP_CKSUM_BAD |
                         PKT_RX_L4_CKSUM_BAD) >> 1,
-                       (PKT_RX_EIP_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,
-                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_EIP_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,
                        /* second 128-bits */
                        0, 0, 0, 0, 0, 0, 0, 0,
-                       (PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
+                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
                         PKT_RX_IP_CKSUM_BAD) >> 1,
-                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_EIP_CKSUM_BAD |
+                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_OUTER_IP_CKSUM_BAD |
                         PKT_RX_L4_CKSUM_BAD) >> 1,
-                       (PKT_RX_EIP_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,
-                       (PKT_RX_IP_CKSUM_GOOD | PKT_RX_EIP_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,
@@ -290,7 +174,7 @@ _iavf_recv_raw_pkts_vec_avx2(struct iavf_rx_queue *rxq,
        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_EIP_CKSUM_BAD);
+                                  PKT_RX_OUTER_IP_CKSUM_BAD);
 
        RTE_SET_USED(avx_aligned); /* for 32B descriptors we don't use this */
 
@@ -640,7 +524,10 @@ _iavf_recv_raw_pkts_vec_avx2_flex_rxd(struct iavf_rx_queue *rxq,
 {
 #define IAVF_DESCS_PER_LOOP_AVX 8
 
-       const uint32_t *type_table = rxq->vsi->adapter->ptype_tbl;
+       struct iavf_adapter *adapter = rxq->vsi->adapter;
+
+       uint64_t offloads = adapter->dev_data->dev_conf.rxmode.offloads;
+       const uint32_t *type_table = adapter->ptype_tbl;
 
        const __m256i mbuf_init = _mm256_set_epi64x(0, 0,
                        0, rxq->mbuf_initializer);
@@ -742,13 +629,13 @@ _iavf_recv_raw_pkts_vec_avx2_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_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
+                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
                         PKT_RX_IP_CKSUM_BAD) >> 1,
-                       (PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
+                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
                         PKT_RX_IP_CKSUM_GOOD) >> 1,
-                       (PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |
+                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |
                         PKT_RX_IP_CKSUM_BAD) >> 1,
-                       (PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |
+                       (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,
@@ -756,13 +643,13 @@ _iavf_recv_raw_pkts_vec_avx2_flex_rxd(struct iavf_rx_queue *rxq,
                        (PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >> 1,
                        /* second 128-bits */
                        0, 0, 0, 0, 0, 0, 0, 0,
-                       (PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
+                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
                         PKT_RX_IP_CKSUM_BAD) >> 1,
-                       (PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
+                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |
                         PKT_RX_IP_CKSUM_GOOD) >> 1,
-                       (PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |
+                       (PKT_RX_OUTER_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |
                         PKT_RX_IP_CKSUM_BAD) >> 1,
-                       (PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |
+                       (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,
@@ -771,26 +658,38 @@ _iavf_recv_raw_pkts_vec_avx2_flex_rxd(struct iavf_rx_queue *rxq,
        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_EIP_CKSUM_BAD);
+                                  PKT_RX_OUTER_IP_CKSUM_BAD);
        /**
         * data to be shuffled by result of flag mask, shifted down 12.
         * If RSS(bit12)/VLAN(bit13) are set,
         * shuffle moves appropriate flags in place.
         */
-       const __m256i rss_vlan_flags_shuf = _mm256_set_epi8(0, 0, 0, 0,
+       const __m256i rss_flags_shuf = _mm256_set_epi8(0, 0, 0, 0,
                        0, 0, 0, 0,
                        0, 0, 0, 0,
-                       PKT_RX_RSS_HASH | PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
-                       PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
+                       PKT_RX_RSS_HASH, 0,
                        PKT_RX_RSS_HASH, 0,
                        /* end up 128-bits */
                        0, 0, 0, 0,
                        0, 0, 0, 0,
                        0, 0, 0, 0,
-                       PKT_RX_RSS_HASH | PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
-                       PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
+                       PKT_RX_RSS_HASH, 0,
                        PKT_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,
+                       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,
+                       0, 0);
+
        uint16_t i, received;
 
        for (i = 0, received = 0; i < nb_pkts;
@@ -938,13 +837,24 @@ _iavf_recv_raw_pkts_vec_avx2_flex_rxd(struct iavf_rx_queue *rxq,
                                _mm256_srli_epi32(flag_bits, 4));
                l3_l4_flags = _mm256_slli_epi32(l3_l4_flags, 1);
                l3_l4_flags = _mm256_and_si256(l3_l4_flags, cksum_mask);
+
                /* set rss and vlan flags */
                const __m256i rss_vlan_flag_bits =
                        _mm256_srli_epi32(flag_bits, 12);
-               const __m256i rss_vlan_flags =
-                       _mm256_shuffle_epi8(rss_vlan_flags_shuf,
+               const __m256i rss_flags =
+                       _mm256_shuffle_epi8(rss_flags_shuf,
                                            rss_vlan_flag_bits);
 
+               __m256i vlan_flags = _mm256_setzero_si256();
+
+               if (rxq->rx_flags == IAVF_RX_FLAGS_VLAN_TAG_LOC_L2TAG1)
+                       vlan_flags =
+                               _mm256_shuffle_epi8(vlan_flags_shuf,
+                                                   rss_vlan_flag_bits);
+
+               const __m256i rss_vlan_flags =
+                       _mm256_or_si256(rss_flags, vlan_flags);
+
                /* merge flags */
                __m256i mbuf_flags = _mm256_or_si256(l3_l4_flags,
                                rss_vlan_flags);
@@ -996,8 +906,8 @@ _iavf_recv_raw_pkts_vec_avx2_flex_rxd(struct iavf_rx_queue *rxq,
                 * needs to load 2nd 16B of each desc for RSS hash parsing,
                 * will cause performance drop to get into this context.
                 */
-               if (rxq->vsi->adapter->eth_dev->data->dev_conf.rxmode.offloads &
-                               DEV_RX_OFFLOAD_RSS_HASH) {
+               if (offloads & RTE_ETH_RX_OFFLOAD_RSS_HASH ||
+                   rxq->rx_flags & IAVF_RX_FLAGS_VLAN_TAG_LOC_L2TAG2_2) {
                        /* load bottom half of every 32B desc */
                        const __m128i raw_desc_bh7 =
                                _mm_load_si128
@@ -1048,36 +958,114 @@ _iavf_recv_raw_pkts_vec_avx2_flex_rxd(struct iavf_rx_queue *rxq,
                                        (_mm256_castsi128_si256(raw_desc_bh0),
                                        raw_desc_bh1, 1);
 
-                       /**
-                        * to shift the 32b RSS hash value to the
-                        * highest 32b of each 128b before mask
-                        */
-                       __m256i rss_hash6_7 =
-                               _mm256_slli_epi64(raw_desc_bh6_7, 32);
-                       __m256i rss_hash4_5 =
-                               _mm256_slli_epi64(raw_desc_bh4_5, 32);
-                       __m256i rss_hash2_3 =
-                               _mm256_slli_epi64(raw_desc_bh2_3, 32);
-                       __m256i rss_hash0_1 =
-                               _mm256_slli_epi64(raw_desc_bh0_1, 32);
-
-                       __m256i rss_hash_msk =
-                               _mm256_set_epi32(0xFFFFFFFF, 0, 0, 0,
-                                                0xFFFFFFFF, 0, 0, 0);
-
-                       rss_hash6_7 = _mm256_and_si256
-                                       (rss_hash6_7, rss_hash_msk);
-                       rss_hash4_5 = _mm256_and_si256
-                                       (rss_hash4_5, rss_hash_msk);
-                       rss_hash2_3 = _mm256_and_si256
-                                       (rss_hash2_3, rss_hash_msk);
-                       rss_hash0_1 = _mm256_and_si256
-                                       (rss_hash0_1, rss_hash_msk);
-
-                       mb6_7 = _mm256_or_si256(mb6_7, rss_hash6_7);
-                       mb4_5 = _mm256_or_si256(mb4_5, rss_hash4_5);
-                       mb2_3 = _mm256_or_si256(mb2_3, rss_hash2_3);
-                       mb0_1 = _mm256_or_si256(mb0_1, rss_hash0_1);
+                       if (offloads & RTE_ETH_RX_OFFLOAD_RSS_HASH) {
+                               /**
+                                * to shift the 32b RSS hash value to the
+                                * highest 32b of each 128b before mask
+                                */
+                               __m256i rss_hash6_7 =
+                                       _mm256_slli_epi64(raw_desc_bh6_7, 32);
+                               __m256i rss_hash4_5 =
+                                       _mm256_slli_epi64(raw_desc_bh4_5, 32);
+                               __m256i rss_hash2_3 =
+                                       _mm256_slli_epi64(raw_desc_bh2_3, 32);
+                               __m256i rss_hash0_1 =
+                                       _mm256_slli_epi64(raw_desc_bh0_1, 32);
+
+                               const __m256i rss_hash_msk =
+                                       _mm256_set_epi32(0xFFFFFFFF, 0, 0, 0,
+                                                        0xFFFFFFFF, 0, 0, 0);
+
+                               rss_hash6_7 = _mm256_and_si256
+                                               (rss_hash6_7, rss_hash_msk);
+                               rss_hash4_5 = _mm256_and_si256
+                                               (rss_hash4_5, rss_hash_msk);
+                               rss_hash2_3 = _mm256_and_si256
+                                               (rss_hash2_3, rss_hash_msk);
+                               rss_hash0_1 = _mm256_and_si256
+                                               (rss_hash0_1, rss_hash_msk);
+
+                               mb6_7 = _mm256_or_si256(mb6_7, rss_hash6_7);
+                               mb4_5 = _mm256_or_si256(mb4_5, rss_hash4_5);
+                               mb2_3 = _mm256_or_si256(mb2_3, rss_hash2_3);
+                               mb0_1 = _mm256_or_si256(mb0_1, rss_hash0_1);
+                       }
+
+                       if (rxq->rx_flags & IAVF_RX_FLAGS_VLAN_TAG_LOC_L2TAG2_2) {
+                               /* merge the status/error-1 bits into one register */
+                               const __m256i status1_4_7 =
+                                       _mm256_unpacklo_epi32(raw_desc_bh6_7,
+                                                             raw_desc_bh4_5);
+                               const __m256i status1_0_3 =
+                                       _mm256_unpacklo_epi32(raw_desc_bh2_3,
+                                                             raw_desc_bh0_1);
+
+                               const __m256i status1_0_7 =
+                                       _mm256_unpacklo_epi64(status1_4_7,
+                                                             status1_0_3);
+
+                               const __m256i l2tag2p_flag_mask =
+                                       _mm256_set1_epi32
+                                       (1 << IAVF_RX_FLEX_DESC_STATUS1_L2TAG2P_S);
+
+                               __m256i l2tag2p_flag_bits =
+                                       _mm256_and_si256
+                                       (status1_0_7, l2tag2p_flag_mask);
+
+                               l2tag2p_flag_bits =
+                                       _mm256_srli_epi32(l2tag2p_flag_bits,
+                                               IAVF_RX_FLEX_DESC_STATUS1_L2TAG2P_S);
+
+                               const __m256i l2tag2_flags_shuf =
+                                       _mm256_set_epi8(0, 0, 0, 0,
+                                                       0, 0, 0, 0,
+                                                       0, 0, 0, 0,
+                                                       0, 0, 0, 0,
+                                                       /* end up 128-bits */
+                                                       0, 0, 0, 0,
+                                                       0, 0, 0, 0,
+                                                       0, 0, 0, 0,
+                                                       0, 0,
+                                                       PKT_RX_VLAN |
+                                                       PKT_RX_VLAN_STRIPPED,
+                                                       0);
+
+                               vlan_flags =
+                                       _mm256_shuffle_epi8(l2tag2_flags_shuf,
+                                                           l2tag2p_flag_bits);
+
+                               /* merge with vlan_flags */
+                               mbuf_flags = _mm256_or_si256
+                                               (mbuf_flags, vlan_flags);
+
+                               /* L2TAG2_2 */
+                               __m256i vlan_tci6_7 =
+                                       _mm256_slli_si256(raw_desc_bh6_7, 4);
+                               __m256i vlan_tci4_5 =
+                                       _mm256_slli_si256(raw_desc_bh4_5, 4);
+                               __m256i vlan_tci2_3 =
+                                       _mm256_slli_si256(raw_desc_bh2_3, 4);
+                               __m256i vlan_tci0_1 =
+                                       _mm256_slli_si256(raw_desc_bh0_1, 4);
+
+                               const __m256i vlan_tci_msk =
+                                       _mm256_set_epi32(0, 0xFFFF0000, 0, 0,
+                                                        0, 0xFFFF0000, 0, 0);
+
+                               vlan_tci6_7 = _mm256_and_si256
+                                               (vlan_tci6_7, vlan_tci_msk);
+                               vlan_tci4_5 = _mm256_and_si256
+                                               (vlan_tci4_5, vlan_tci_msk);
+                               vlan_tci2_3 = _mm256_and_si256
+                                               (vlan_tci2_3, vlan_tci_msk);
+                               vlan_tci0_1 = _mm256_and_si256
+                                               (vlan_tci0_1, vlan_tci_msk);
+
+                               mb6_7 = _mm256_or_si256(mb6_7, vlan_tci6_7);
+                               mb4_5 = _mm256_or_si256(mb4_5, vlan_tci4_5);
+                               mb2_3 = _mm256_or_si256(mb2_3, vlan_tci2_3);
+                               mb0_1 = _mm256_or_si256(mb0_1, vlan_tci0_1);
+                       }
                } /* if() on RSS hash parsing */
 #endif
 
@@ -1391,7 +1379,7 @@ iavf_vtx1(volatile struct iavf_tx_desc *txdp,
                 ((uint64_t)pkt->data_len << IAVF_TXD_QW1_TX_BUF_SZ_SHIFT));
 
        __m128i descriptor = _mm_set_epi64x(high_qw,
-                               pkt->buf_physaddr + pkt->data_off);
+                               pkt->buf_iova + pkt->data_off);
        _mm_store_si128((__m128i *)txdp, descriptor);
 }
 
@@ -1430,15 +1418,15 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
                __m256i desc2_3 =
                        _mm256_set_epi64x
                                (hi_qw3,
-                                pkt[3]->buf_physaddr + pkt[3]->data_off,
+                                pkt[3]->buf_iova + pkt[3]->data_off,
                                 hi_qw2,
-                                pkt[2]->buf_physaddr + pkt[2]->data_off);
+                                pkt[2]->buf_iova + pkt[2]->data_off);
                __m256i desc0_1 =
                        _mm256_set_epi64x
                                (hi_qw1,
-                                pkt[1]->buf_physaddr + pkt[1]->data_off,
+                                pkt[1]->buf_iova + pkt[1]->data_off,
                                 hi_qw0,
-                                pkt[0]->buf_physaddr + pkt[0]->data_off);
+                                pkt[0]->buf_iova + pkt[0]->data_off);
                _mm256_store_si256((void *)(txdp + 2), desc2_3);
                _mm256_store_si256((void *)txdp, desc0_1);
        }
@@ -1513,7 +1501,7 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 
        txq->tx_tail = tx_id;
 
-       IAVF_PCI_REG_WRITE(txq->qtx_tail, txq->tx_tail);
+       IAVF_PCI_REG_WC_WRITE(txq->qtx_tail, txq->tx_tail);
 
        return nb_pkts;
 }