RTE_MARKER typedefs are a GCC extension unsupported by MSVC. Use
new rte_mbuf_rearm_data and rte_mbuf_rx_descriptor_fields1 accessors
that provide a compatible type pointer without using the marker fields.

Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com>
---
 drivers/net/i40e/i40e_rxtx_vec_altivec.c | 18 ++++++------------
 drivers/net/i40e/i40e_rxtx_vec_avx2.c    | 16 ++++++++--------
 drivers/net/i40e/i40e_rxtx_vec_avx512.c  | 16 ++++++++--------
 drivers/net/i40e/i40e_rxtx_vec_common.h  |  4 +---
 drivers/net/i40e/i40e_rxtx_vec_neon.c    | 16 ++++++++--------
 drivers/net/i40e/i40e_rxtx_vec_sse.c     | 16 ++++++++--------
 6 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c 
b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
index b6b0d38..3e065ee 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
@@ -55,7 +55,6 @@
        /* Initialize the mbufs in vector, process 2 mbufs in one loop */
        for (i = 0; i < RTE_I40E_RXQ_REARM_THRESH; i += 2, rxep += 2) {
                __vector unsigned long vaddr0, vaddr1;
-               uintptr_t p0, p1;
 
                mb0 = rxep[0].mbuf;
                mb1 = rxep[1].mbuf;
@@ -66,10 +65,8 @@
                  * anyway. So overwrite whole 8 bytes with one load:
                  * 6 bytes of rearm_data plus first 2 bytes of ol_flags.
                  */
-               p0 = (uintptr_t)&mb0->rearm_data;
-               *(uint64_t *)p0 = rxq->mbuf_initializer;
-               p1 = (uintptr_t)&mb1->rearm_data;
-               *(uint64_t *)p1 = rxq->mbuf_initializer;
+               *rte_mbuf_rearm_data(mb0) = rxq->mbuf_initializer;
+               *rte_mbuf_rearm_data(mb1) = rxq->mbuf_initializer;
 
                /* load buf_addr(lo 64bit) and buf_iova(hi 64bit) */
                vaddr0 = vec_ld(0, (__vector unsigned long *)&mb0->buf_addr);
@@ -370,12 +367,10 @@
 
                /* D.3 copy final 3,4 data to rx_pkts */
                vec_st(pkt_mb4, 0,
-                (__vector unsigned char *)&rx_pkts[pos + 3]
-                       ->rx_descriptor_fields1
+                (__vector unsigned char 
*)rte_mbuf_rx_descriptor_fields1(rx_pkts[pos + 3])
                );
                vec_st(pkt_mb3, 0,
-                (__vector unsigned char *)&rx_pkts[pos + 2]
-                       ->rx_descriptor_fields1
+                (__vector unsigned char 
*)rte_mbuf_rx_descriptor_fields1(rx_pkts[pos + 2])
                );
 
                /* D.2 pkt 1,2 set in_port/nb_seg and remove crc */
@@ -422,11 +417,10 @@
 
                /* D.3 copy final 1,2 data to rx_pkts */
                vec_st(pkt_mb2, 0,
-                (__vector unsigned char *)&rx_pkts[pos + 1]
-                       ->rx_descriptor_fields1
+                (__vector unsigned char 
*)rte_mbuf_rx_descriptor_fields1(rx_pkts[pos + 1])
                );
                vec_st(pkt_mb1, 0,
-                (__vector unsigned char *)&rx_pkts[pos]->rx_descriptor_fields1
+                (__vector unsigned char 
*)rte_mbuf_rx_descriptor_fields1(rx_pkts[pos])
                );
                desc_to_ptype_v(descs, &rx_pkts[pos], ptype_tbl);
                desc_to_olflags_v(descs, &rx_pkts[pos]);
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c 
b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
index f468c1f..027afbe 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
@@ -543,10 +543,10 @@
                rearm2 = _mm256_permute2f128_si256(rearm2, mb2_3, 0x20);
                rearm0 = _mm256_permute2f128_si256(rearm0, mb0_1, 0x20);
                /* write to mbuf */
-               _mm256_storeu_si256((__m256i *)&rx_pkts[i + 6]->rearm_data, 
rearm6);
-               _mm256_storeu_si256((__m256i *)&rx_pkts[i + 4]->rearm_data, 
rearm4);
-               _mm256_storeu_si256((__m256i *)&rx_pkts[i + 2]->rearm_data, 
rearm2);
-               _mm256_storeu_si256((__m256i *)&rx_pkts[i + 0]->rearm_data, 
rearm0);
+               _mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 
6]), rearm6);
+               _mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 
4]), rearm4);
+               _mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 
2]), rearm2);
+               _mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 
0]), rearm0);
 
                /* repeat for the odd mbufs */
                const __m256i odd_flags = _mm256_castsi128_si256(
@@ -561,10 +561,10 @@
                rearm3 = _mm256_blend_epi32(rearm3, mb2_3, 0xF0);
                rearm1 = _mm256_blend_epi32(rearm1, mb0_1, 0xF0);
                /* again write to mbufs */
-               _mm256_storeu_si256((__m256i *)&rx_pkts[i + 7]->rearm_data, 
rearm7);
-               _mm256_storeu_si256((__m256i *)&rx_pkts[i + 5]->rearm_data, 
rearm5);
-               _mm256_storeu_si256((__m256i *)&rx_pkts[i + 3]->rearm_data, 
rearm3);
-               _mm256_storeu_si256((__m256i *)&rx_pkts[i + 1]->rearm_data, 
rearm1);
+               _mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 
7]), rearm7);
+               _mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 
5]), rearm5);
+               _mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 
3]), rearm3);
+               _mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 
1]), rearm1);
 
                /* extract and record EOP bit */
                if (split_packet) {
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c 
b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
index f3050cd..91dda60 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
@@ -580,13 +580,13 @@
                rearm0 = _mm256_permute2f128_si256(rearm0, mb0_1, 0x20);
                /* write to mbuf */
                _mm256_storeu_si256
-                       ((__m256i *)&rx_pkts[i + 6]->rearm_data, rearm6);
+                       ((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 6]), 
rearm6);
                _mm256_storeu_si256
-                       ((__m256i *)&rx_pkts[i + 4]->rearm_data, rearm4);
+                       ((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 4]), 
rearm4);
                _mm256_storeu_si256
-                       ((__m256i *)&rx_pkts[i + 2]->rearm_data, rearm2);
+                       ((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 2]), 
rearm2);
                _mm256_storeu_si256
-                       ((__m256i *)&rx_pkts[i + 0]->rearm_data, rearm0);
+                       ((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 0]), 
rearm0);
 
                /* repeat for the odd mbufs */
                const __m256i odd_flags = _mm256_castsi128_si256
@@ -606,13 +606,13 @@
                rearm1 = _mm256_blend_epi32(rearm1, mb0_1, 0xF0);
                /* again write to mbufs */
                _mm256_storeu_si256
-                       ((__m256i *)&rx_pkts[i + 7]->rearm_data, rearm7);
+                       ((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 7]), 
rearm7);
                _mm256_storeu_si256
-                       ((__m256i *)&rx_pkts[i + 5]->rearm_data, rearm5);
+                       ((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 5]), 
rearm5);
                _mm256_storeu_si256
-                       ((__m256i *)&rx_pkts[i + 3]->rearm_data, rearm3);
+                       ((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 3]), 
rearm3);
                _mm256_storeu_si256
-                       ((__m256i *)&rx_pkts[i + 1]->rearm_data, rearm1);
+                       ((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 1]), 
rearm1);
 
                /* extract and record EOP bit */
                if (split_packet) {
diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h 
b/drivers/net/i40e/i40e_rxtx_vec_common.h
index 8b74563..5633268 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_common.h
+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h
@@ -189,7 +189,6 @@
 static inline int
 i40e_rxq_vec_setup_default(struct i40e_rx_queue *rxq)
 {
-       uintptr_t p;
        struct rte_mbuf mb_def = { .buf_addr = 0 }; /* zeroed mbuf */
 
        mb_def.nb_segs = 1;
@@ -199,8 +198,7 @@
 
        /* prevent compiler reordering: rearm_data covers previous fields */
        rte_compiler_barrier();
-       p = (uintptr_t)&mb_def.rearm_data;
-       rxq->mbuf_initializer = *(uint64_t *)p;
+       rxq->mbuf_initializer = *rte_mbuf_rearm_data(&mb_def);
        rxq->rx_using_sse = 1;
        return 0;
 }
diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c 
b/drivers/net/i40e/i40e_rxtx_vec_neon.c
index d873e30..29dfd92 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
@@ -300,10 +300,10 @@
        rearm2 = vsetq_lane_u64(vgetq_lane_u32(vlan0, 2), mbuf_init, 1);
        rearm3 = vsetq_lane_u64(vgetq_lane_u32(vlan0, 3), mbuf_init, 1);
 
-       vst1q_u64((uint64_t *)&rx_pkts[0]->rearm_data, rearm0);
-       vst1q_u64((uint64_t *)&rx_pkts[1]->rearm_data, rearm1);
-       vst1q_u64((uint64_t *)&rx_pkts[2]->rearm_data, rearm2);
-       vst1q_u64((uint64_t *)&rx_pkts[3]->rearm_data, rearm3);
+       vst1q_u64(rte_mbuf_rearm_data(rx_pkts[0]), rearm0);
+       vst1q_u64(rte_mbuf_rearm_data(rx_pkts[1]), rearm1);
+       vst1q_u64(rte_mbuf_rearm_data(rx_pkts[2]), rearm2);
+       vst1q_u64(rte_mbuf_rearm_data(rx_pkts[3]), rearm3);
 }
 
 #define PKTLEN_SHIFT     10
@@ -492,13 +492,13 @@
                pkt_mb1 = vreinterpretq_u8_u16(tmp);
 
                /* D.3 copy final data to rx_pkts */
-               vst1q_u8((void *)&rx_pkts[pos + 3]->rx_descriptor_fields1,
+               vst1q_u8(rte_mbuf_rx_descriptor_fields1(rx_pkts[pos + 3]),
                                pkt_mb4);
-               vst1q_u8((void *)&rx_pkts[pos + 2]->rx_descriptor_fields1,
+               vst1q_u8(rte_mbuf_rx_descriptor_fields1(rx_pkts[pos + 2]),
                                pkt_mb3);
-               vst1q_u8((void *)&rx_pkts[pos + 1]->rx_descriptor_fields1,
+               vst1q_u8(rte_mbuf_rx_descriptor_fields1(rx_pkts[pos + 1]),
                                pkt_mb2);
-               vst1q_u8((void *)&rx_pkts[pos]->rx_descriptor_fields1,
+               vst1q_u8(rte_mbuf_rx_descriptor_fields1(rx_pkts[pos]),
                                pkt_mb1);
 
                desc_to_ptype_v(descs, &rx_pkts[pos], ptype_tbl);
diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c 
b/drivers/net/i40e/i40e_rxtx_vec_sse.c
index 2d4480a..d87b5ba 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_sse.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c
@@ -319,10 +319,10 @@
                        offsetof(struct rte_mbuf, rearm_data) + 8);
        RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, rearm_data) !=
                        RTE_ALIGN(offsetof(struct rte_mbuf, rearm_data), 16));
-       _mm_store_si128((__m128i *)&rx_pkts[0]->rearm_data, rearm0);
-       _mm_store_si128((__m128i *)&rx_pkts[1]->rearm_data, rearm1);
-       _mm_store_si128((__m128i *)&rx_pkts[2]->rearm_data, rearm2);
-       _mm_store_si128((__m128i *)&rx_pkts[3]->rearm_data, rearm3);
+       _mm_store_si128((__m128i *)rte_mbuf_rearm_data(rx_pkts[0]), rearm0);
+       _mm_store_si128((__m128i *)rte_mbuf_rearm_data(rx_pkts[1]), rearm1);
+       _mm_store_si128((__m128i *)rte_mbuf_rearm_data(rx_pkts[2]), rearm2);
+       _mm_store_si128((__m128i *)rte_mbuf_rearm_data(rx_pkts[3]), rearm3);
 }
 
 #define PKTLEN_SHIFT     10
@@ -535,9 +535,9 @@
                staterr = _mm_unpacklo_epi32(sterr_tmp1, sterr_tmp2);
 
                /* D.3 copy final 3,4 data to rx_pkts */
-               _mm_storeu_si128((void *)&rx_pkts[pos+3]->rx_descriptor_fields1,
+               _mm_storeu_si128(rte_mbuf_rx_descriptor_fields1(rx_pkts[pos+3]),
                                 pkt_mb4);
-               _mm_storeu_si128((void *)&rx_pkts[pos+2]->rx_descriptor_fields1,
+               _mm_storeu_si128(rte_mbuf_rx_descriptor_fields1(rx_pkts[pos+2]),
                                 pkt_mb3);
 
                /* D.2 pkt 1,2 set in_port/nb_seg and remove crc */
@@ -571,9 +571,9 @@
                staterr = _mm_packs_epi32(staterr, zero);
 
                /* D.3 copy final 1,2 data to rx_pkts */
-               _mm_storeu_si128((void *)&rx_pkts[pos+1]->rx_descriptor_fields1,
+               _mm_storeu_si128(rte_mbuf_rx_descriptor_fields1(rx_pkts[pos+1]),
                                 pkt_mb2);
-               _mm_storeu_si128((void *)&rx_pkts[pos]->rx_descriptor_fields1,
+               _mm_storeu_si128(rte_mbuf_rx_descriptor_fields1(rx_pkts[pos]),
                                 pkt_mb1);
                desc_to_ptype_v(descs, &rx_pkts[pos], ptype_tbl);
                /* C.4 calc available number of desc */
-- 
1.8.3.1

Reply via email to