1 From 44b3a182e791c2f023d2a237a03eb9d3014c7da6 Mon Sep 17 00:00:00 2001
2 From: Ray Kinsella <ray.kinsella@intel.com>
3 Date: Thu, 4 Aug 2016 17:06:21 +0100
4 Subject: [PATCH] Revert "ixgbe: fix packet type from vector Rx"
6 This reverts commit d9a2009a81089093645fea2e04b51dd37edf3e6f.
9 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
11 Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
13 drivers/net/ixgbe/ixgbe_ethdev.c | 4 +++-
14 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 34 +++++++++++++++++++++++-----------
15 2 files changed, 26 insertions(+), 12 deletions(-)
17 diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
18 index d478a15..63966a6 100644
19 --- a/drivers/net/ixgbe/ixgbe_ethdev.c
20 +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
21 @@ -3117,7 +3117,9 @@ ixgbe_dev_supported_ptypes_get(struct rte_eth_dev *dev)
22 if (dev->rx_pkt_burst == ixgbe_recv_pkts ||
23 dev->rx_pkt_burst == ixgbe_recv_pkts_lro_single_alloc ||
24 dev->rx_pkt_burst == ixgbe_recv_pkts_lro_bulk_alloc ||
25 - dev->rx_pkt_burst == ixgbe_recv_pkts_bulk_alloc)
26 + dev->rx_pkt_burst == ixgbe_recv_pkts_bulk_alloc ||
27 + dev->rx_pkt_burst == ixgbe_recv_pkts_vec ||
28 + dev->rx_pkt_burst == ixgbe_recv_scattered_pkts_vec)
32 diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
33 index 1c4fd7c..3aae401 100644
34 --- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
35 +++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
36 @@ -231,6 +231,8 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
38 __m128i dd_check, eop_check;
40 + __m128i desc_mask = _mm_set_epi32(0xFFFFFFFF, 0xFFFFFFFF,
41 + 0xFFFFFFFF, 0xFFFF07F0);
43 /* nb_pkts shall be less equal than RTE_IXGBE_MAX_RX_BURST */
44 nb_pkts = RTE_MIN(nb_pkts, RTE_IXGBE_MAX_RX_BURST);
45 @@ -271,8 +273,9 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
46 13, 12, /* octet 12~13, 16 bits data_len */
47 0xFF, 0xFF, /* skip high 16 bits pkt_len, zero out */
48 13, 12, /* octet 12~13, low 16 bits pkt_len */
49 - 0xFF, 0xFF, /* skip 32 bit pkt_type */
51 + 0xFF, 0xFF, /* skip high 16 bits pkt_type */
52 + 1, /* octet 1, 8 bits pkt_type field */
53 + 0 /* octet 0, 4 bits offset 4 pkt_type field */
56 /* Cache is empty -> need to scan the buffer rings, but first move
57 @@ -294,6 +297,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
58 for (pos = 0, nb_pkts_recd = 0; pos < nb_pkts;
59 pos += RTE_IXGBE_DESCS_PER_LOOP,
60 rxdp += RTE_IXGBE_DESCS_PER_LOOP) {
61 + __m128i descs0[RTE_IXGBE_DESCS_PER_LOOP];
62 __m128i descs[RTE_IXGBE_DESCS_PER_LOOP];
63 __m128i pkt_mb1, pkt_mb2, pkt_mb3, pkt_mb4;
64 __m128i zero, staterr, sterr_tmp1, sterr_tmp2;
65 @@ -304,7 +308,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
67 /* Read desc statuses backwards to avoid race condition */
68 /* A.1 load 4 pkts desc */
69 - descs[3] = _mm_loadu_si128((__m128i *)(rxdp + 3));
70 + descs0[3] = _mm_loadu_si128((__m128i *)(rxdp + 3));
72 /* B.2 copy 2 mbuf point into rx_pkts */
73 _mm_storeu_si128((__m128i *)&rx_pkts[pos], mbp1);
74 @@ -312,10 +316,10 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
75 /* B.1 load 1 mbuf point */
76 mbp2 = _mm_loadu_si128((__m128i *)&sw_ring[pos+2]);
78 - descs[2] = _mm_loadu_si128((__m128i *)(rxdp + 2));
79 + descs0[2] = _mm_loadu_si128((__m128i *)(rxdp + 2));
80 /* B.1 load 2 mbuf point */
81 - descs[1] = _mm_loadu_si128((__m128i *)(rxdp + 1));
82 - descs[0] = _mm_loadu_si128((__m128i *)(rxdp));
83 + descs0[1] = _mm_loadu_si128((__m128i *)(rxdp + 1));
84 + descs0[0] = _mm_loadu_si128((__m128i *)(rxdp));
86 /* B.2 copy 2 mbuf point into rx_pkts */
87 _mm_storeu_si128((__m128i *)&rx_pkts[pos+2], mbp2);
88 @@ -327,6 +331,14 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
89 rte_mbuf_prefetch_part2(rx_pkts[pos + 3]);
92 + /* A* mask out 0~3 bits RSS type */
93 + descs[3] = _mm_and_si128(descs0[3], desc_mask);
94 + descs[2] = _mm_and_si128(descs0[2], desc_mask);
96 + /* A* mask out 0~3 bits RSS type */
97 + descs[1] = _mm_and_si128(descs0[1], desc_mask);
98 + descs[0] = _mm_and_si128(descs0[0], desc_mask);
100 /* avoid compiler reorder optimization */
101 rte_compiler_barrier();
103 @@ -334,22 +346,22 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
104 pkt_mb4 = _mm_shuffle_epi8(descs[3], shuf_msk);
105 pkt_mb3 = _mm_shuffle_epi8(descs[2], shuf_msk);
107 - /* D.1 pkt 1,2 convert format from desc to pktmbuf */
108 - pkt_mb2 = _mm_shuffle_epi8(descs[1], shuf_msk);
109 - pkt_mb1 = _mm_shuffle_epi8(descs[0], shuf_msk);
111 /* C.1 4=>2 filter staterr info only */
112 sterr_tmp2 = _mm_unpackhi_epi32(descs[3], descs[2]);
113 /* C.1 4=>2 filter staterr info only */
114 sterr_tmp1 = _mm_unpackhi_epi32(descs[1], descs[0]);
116 /* set ol_flags with vlan packet type */
117 - desc_to_olflags_v(descs, vlan_flags, &rx_pkts[pos]);
118 + desc_to_olflags_v(descs0, vlan_flags, &rx_pkts[pos]);
120 /* D.2 pkt 3,4 set in_port/nb_seg and remove crc */
121 pkt_mb4 = _mm_add_epi16(pkt_mb4, crc_adjust);
122 pkt_mb3 = _mm_add_epi16(pkt_mb3, crc_adjust);
124 + /* D.1 pkt 1,2 convert format from desc to pktmbuf */
125 + pkt_mb2 = _mm_shuffle_epi8(descs[1], shuf_msk);
126 + pkt_mb1 = _mm_shuffle_epi8(descs[0], shuf_msk);
128 /* C.2 get 4 pkts staterr value */
129 zero = _mm_xor_si128(dd_check, dd_check);
130 staterr = _mm_unpacklo_epi32(sterr_tmp1, sterr_tmp2);