net/ice: fix outher chksum on cvl unknown
PATCH 1/1 net/ice: fix outher chksum on cvl unknown
From: murphy <[email protected]>
When set 'csum set outer-udp hw 0' ,support for ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S,mark the packet PKT_RX_OUTER_L4_CKSUM_BAD or PKT_RX_OUTER_L4_CKSUM_GOOD
--- drivers/net/ice/ice_rxtx.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ice/ice_rxtx.c +5 -0
@@ -1424,6 +1424,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags; }
Signature · 1 line
2.17.1
PATCH 1/1 net/ice: fix outher chksum on cvl unknown
From: murphy <[email protected]>
When set 'csum set outer-udp hw 0' ,support for ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S,mark the packet PKT_RX_OUTER_L4_CKSUM_BAD or PKT_RX_OUTER_L4_CKSUM_GOOD.
v2:
- cover vector path
--- drivers/net/ice/ice_rxtx.c | 5 ++ drivers/net/ice/ice_rxtx_vec_avx2.c | 110 ++++++++++++++++++++-------- drivers/net/ice/ice_rxtx_vec_sse.c | 71 ++++++++++++------ 3 files changed, 133 insertions(+), 53 deletions(-)
drivers/net/ice/ice_rxtx.c +5 -0
@@ -1424,6 +1424,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags; }
drivers/net/ice/ice_rxtx_vec_avx2.c +78 -32
127 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_sse.c +50 -21
105 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 1/1 net/ice: fix outher chksum on cvl unknown
From: murphy <[email protected]>
When set 'csum set outer-udp hw 0' ,support for ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S,mark the packet PKT_RX_OUTER_L4_CKSUM_BAD or PKT_RX_OUTER_L4_CKSUM_GOOD.
v2:
- cover vector path
v3:
- add PKT_RX_OUTER_L4_CKSUM_GOOD in vector path.
- rename some variable name.
--- drivers/net/ice/ice_rxtx.c | 5 ++ drivers/net/ice/ice_rxtx_vec_avx2.c | 117 ++++++++++++++++++++-------- drivers/net/ice/ice_rxtx_vec_sse.c | 75 +++++++++++++----- 3 files changed, 144 insertions(+), 53 deletions(-)
drivers/net/ice/ice_rxtx.c +5 -0
@@ -1424,6 +1424,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags; }
drivers/net/ice/ice_rxtx_vec_avx2.c +85 -32
134 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_sse.c +54 -21
109 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v4 1/1 net/ice: fix outher chksum on cvl unknown
Currently, driver does not supports parse UDP outer checksum flag of tunneled packets.
When execute 'csum set outer-udp hw 0' and 'csum parse-tunnel on 0' commands to enable hardware UDP outer checksum. This patch supports parse UDP outer checksum flag of tunneled packets.
---
v4:
- cover AVX512 vector path.
v3:
- add PKT_RX_OUTER_L4_CKSUM_GOOD in AVX2 and SSE vector path.
- rename some variable name.
v2:
- cover AVX2 and SSE vector path
drivers/net/ice/ice_rxtx.c | 5 ++ drivers/net/ice/ice_rxtx_vec_avx2.c | 117 +++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_avx512.c | 116 ++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_sse.c | 75 ++++++++++++----- 4 files changed, 228 insertions(+), 85 deletions(-)
drivers/net/ice/ice_rxtx.c +5 -0
@@ -1451,6 +1451,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags; }
drivers/net/ice/ice_rxtx_vec_avx2.c +85 -32
134 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_avx512.c +84 -32
133 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_sse.c +54 -21
109 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 1/1 net/ice: fix outher chksum on cvl unknown
Currently, driver does not supports parse UDP outer checksum flag of tunneled packets.
When execute 'csum set outer-udp hw 0' and 'csum parse-tunnel on 0' commands to enable hardware UDP outer checksum. This patch supports parse UDP outer checksum flag of tunneled packets.
--- drivers/net/ice/ice_rxtx.c | 5 ++ drivers/net/ice/ice_rxtx_vec_avx2.c | 117 +++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_avx512.c | 116 ++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_sse.c | 75 ++++++++++++----- 4 files changed, 228 insertions(+), 85 deletions(-)
drivers/net/ice/ice_rxtx.c +5 -0
@@ -1451,6 +1451,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags; }
drivers/net/ice/ice_rxtx_vec_avx2.c +85 -32
134 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_avx512.c +84 -32
133 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_sse.c +54 -21
109 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v5 1/1 net/ice: fix outher chksum on cvl unknown
In reply to Murphy YangCurrently, driver does not supports parse UDP outer checksum flag of tunneled packets.
When execute 'csum set outer-udp hw 0' and 'csum parse-tunnel on 0' commands to enable hardware UDP outer checksum. This patch supports parse UDP outer checksum flag of tunneled packets.
---
v5:
- fix outer L4 checksum mask for vector path.
v4:
- cover AVX512 vector path.
v3:
- add PKT_RX_OUTER_L4_CKSUM_GOOD in AVX2 and SSE vector path.
- rename some variable name.
v2:
- cover AVX2 and SSE vector path
drivers/net/ice/ice_rxtx.c | 5 ++ drivers/net/ice/ice_rxtx_vec_avx2.c | 117 +++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_avx512.c | 116 ++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_sse.c | 75 ++++++++++++----- 4 files changed, 228 insertions(+), 85 deletions(-)
drivers/net/ice/ice_rxtx.c +5 -0
@@ -1451,6 +1451,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags; }
drivers/net/ice/ice_rxtx_vec_avx2.c +85 -32
134 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_avx512.c +84 -32
133 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_sse.c +54 -21
109 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v6 1/1 net/ice: fix outer checksum on cvl unknown
Currently, driver does not support parse UDP outer checksum flag of tunneled packets.
When execute 'csum set outer-udp hw 0' and 'csum parse-tunnel on 0' commands to enable hardware UDP outer checksum. This patch supports parse UDP outer checksum flag of tunneled packets.
---
v6:
- rename variable name.
- update comments.
v5:
- fix outer L4 checksum mask for vector path.
v4:
- cover AVX512 vector path.
v3:
- add PKT_RX_OUTER_L4_CKSUM_GOOD in AVX2 and SSE vector path.
- rename variable name.
v2:
- cover AVX2 and SSE vector path
drivers/net/ice/ice_rxtx.c | 5 ++ drivers/net/ice/ice_rxtx_vec_avx2.c | 118 +++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_avx512.c | 117 ++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_sse.c | 78 ++++++++++++----- 4 files changed, 233 insertions(+), 85 deletions(-)
drivers/net/ice/ice_rxtx.c +5 -0
@@ -1451,6 +1451,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags; }
drivers/net/ice/ice_rxtx_vec_avx2.c +86 -32
135 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_avx512.c +85 -32
134 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_sse.c +57 -21
112 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v6] net/ice: fix outer checksum on cvl unknown
Regards,
Xie Wei
Quoted 622 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Murphy Yang
Sent: Monday, November 9, 2020 2:07 PM
To: [email protected]
Cc: Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>; Yang, SteveX <[email protected]>; Rong, Leyi <[email protected]>; Lu, Wenzhuo <[email protected]>; Yang, MurphyX <[email protected]>
Subject: [dpdk-dev] [PATCH v6] net/ice: fix outer checksum on cvl unknownCurrently, driver does not support parse UDP outer checksum flag of tunneled packets.
When execute 'csum set outer-udp hw 0' and 'csum parse-tunnel on 0' commands to enable hardware UDP outer checksum. This patch supports parse UDP outer checksum flag of tunneled packets.
Fixes dbf3c0e77a22 ("net/ice: handle Rx flex descriptor")Fixes 4ab7dbb0a0f6 ("net/ice: switch to Rx flexible descriptor in AVX path")Fixes ece1f8a8f1c8 ("net/ice: switch to flexible descriptor in SSE path")Signed-off-by Murphy Yang <[email protected]>---
v6:
- rename variable name.
- update comments.
v5:
- fix outer L4 checksum mask for vector path.
v4:
- cover AVX512 vector path.
v3:
- addPKT_RX_OUTER_L4_CKSUM_GOODin AVX2 and SSE vector path.
- rename variable name.
v2:
- cover AVX2 and SSE vector pathdrivers/net/ice/ice_rxtx.c | 5 ++ drivers/net/ice/ice_rxtx_vec_avx2.c | 118 +++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_avx512.c | 117 ++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_sse.c | 78 ++++++++++++----- 4 files changed, 233 insertions(+), 85 deletions(-)drivers/net/ice/ice_rxtx.c index renamed from drivers/net/ice/ice_rxtx.c +0
-0
5fbd68eafc..24a7caeb98100644drivers/net/ice/ice_rxtx.c +5
-0@@ -1451,6 +1451,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags;}
drivers/net/ice/ice_rxtx_vec_avx2.c +1
-4@@ -251,43 +251,88 @@ _ice_recv_raw_pkts_vec_avx2(structice_rx_queue *rxq, struct rte_mbuf **rx_pkts, * bit13 is for VLAN indication. */ const __m256i flags_mask = -_mm256_set1_epi32 ((7 <<4 ) | (1 <<12 ) | (1 <<13 )); +_mm256_set1_epi32 ((0xF <<4 ) | (1 <<12 ) | (1 <<13 ));/** * data to be shuffled by the result of the flags mask shifted by 4 * bits. This gives use the l3_l4 flags. */ - 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|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-3-/* second 128-bits */ - 0, 0, 0, 0, 0, 0, 0, 0, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_GOOD) >> 1);drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+const __m256i l3_l4_flags_shuf = + _mm256_set_epi8((PKT_RX_OUTER_L4_CKSUM_BAD >> 20|
drivers/net/ice/ice_rxtx_vec_avx2.c +3
-0+PKT_RX_EIP_CKSUM_BAD |PKT_RX_L4_CKSUM_BAD | + PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +8
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + /** + * second 128-bits + * shift right 20 bits to use the low two bits to indicate + * outer checksum status + * shift right 1 bit to make sure it not exceed 255 + */ + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +1
-1+ PKT_RX_IP_CKSUM_GOOD) >> 1); const __m256i cksum_mask = - _mm256_set1_epi32(PKT_RX_IP_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- PKT_RX_L4_CKSUM_GOOD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +13
-1- PKT_RX_EIP_CKSUM_BAD); +_mm256_set1_epi32 (PKT_RX_IP_CKSUM_MASK | +PKT_RX_L4_CKSUM_MASK | +PKT_RX_EIP_CKSUM_BAD | +PKT_RX_OUTER_L4_CKSUM_MASK );/** * data to be shuffled by result of flag mask, shifted down 12. * If RSS(bit12)/VLAN(bit13) are set, @@ -469,6 +514,15 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, __m256i l3_l4_flags =_mm256_shuffle_epi8 (l3_l4_flags_shuf,_mm256_srli_epi32 (flag_bits,4 )); l3_l4_flags =_mm256_slli_epi32 (l3_l4_flags,1 ); + +__m256i l4_outer_mask =_mm256_set1_epi32 (0x6 ); +__m256i l4_outer_flags = +_mm256_and_si256 (l3_l4_flags, l4_outer_mask); + l4_outer_flags =_mm256_slli_epi32 (l4_outer_flags,20 ); + +__m256i l3_l4_mask =_mm256_set1_epi32 (~0x6 ); + l3_l4_flags =_mm256_and_si256 (l3_l4_flags, l3_l4_mask); + l3_l4_flags =_mm256_or_si256 (l3_l4_flags, l4_outer_flags);drivers/net/ice/ice_rxtx_vec_avx2.c +0
-0l3_l4_flags =_mm256_and_si256 (l3_l4_flags, cksum_mask);/* set rss and vlan flags */ const __m256i rss_vlan_flag_bits =drivers/net/ice/ice_rxtx_vec_avx512.c +1
-4@@ -211,43 +211,88 @@ _ice_recv_raw_pkts_vec_avx512(structice_rx_queue *rxq, * bit13 is for VLAN indication. */ const __m256i flags_mask = -_mm256_set1_epi32 ((7 <<4 ) | (1 <<12 ) | (1 <<13 )); +_mm256_set1_epi32 ((0xF <<4 ) | (1 <<12 ) | (1 <<13 ));/** * data to be shuffled by the result of the flags mask shifted by 4 * bits. This gives use the l3_l4 flags. */ - 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|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-3-/* 2nd 128-bits */ - 0, 0, 0, 0, 0, 0, 0, 0, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_GOOD) >> 1);drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+const __m256i l3_l4_flags_shuf = + _mm256_set_epi8((PKT_RX_OUTER_L4_CKSUM_BAD >> 20|
drivers/net/ice/ice_rxtx_vec_avx512.c +3
-0+PKT_RX_EIP_CKSUM_BAD |PKT_RX_L4_CKSUM_BAD | + PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +8
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + /** + * second 128-bits + * shift right 20 bits to use the low two bits to indicate + * outer checksum status + * shift right 1 bit to make sure it not exceed 255 + */ + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +1
-1+ PKT_RX_IP_CKSUM_GOOD) >> 1); const __m256i cksum_mask = - _mm256_set1_epi32(PKT_RX_IP_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- PKT_RX_L4_CKSUM_GOOD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +12
-1- PKT_RX_EIP_CKSUM_BAD); +_mm256_set1_epi32 (PKT_RX_IP_CKSUM_MASK | +PKT_RX_L4_CKSUM_MASK | +PKT_RX_EIP_CKSUM_BAD | +PKT_RX_OUTER_L4_CKSUM_MASK );/** * data to be shuffled by result of flag mask, shifted down 12. * If RSS(bit12)/VLAN(bit13) are set, @@ -432,6 +477,14 @@ _ice_recv_raw_pkts_vec_avx512(structice_rx_queue *rxq, __m256i l3_l4_flags =_mm256_shuffle_epi8 (l3_l4_flags_shuf,_mm256_srli_epi32 (flag_bits,4 )); l3_l4_flags =_mm256_slli_epi32 (l3_l4_flags,1 ); +__m256i l4_outer_mask =_mm256_set1_epi32 (0x6 ); +__m256i l4_outer_flags = +_mm256_and_si256 (l3_l4_flags, l4_outer_mask); + l4_outer_flags =_mm256_slli_epi32 (l4_outer_flags,20 ); + +__m256i l3_l4_mask =_mm256_set1_epi32 (~0x6 ); + l3_l4_flags =_mm256_and_si256 (l3_l4_flags, l3_l4_mask); + l3_l4_flags =_mm256_or_si256 (l3_l4_flags, l4_outer_flags);drivers/net/ice/ice_rxtx_vec_avx512.c +0
-0l3_l4_flags =_mm256_and_si256 (l3_l4_flags, cksum_mask);/* set rss and vlan flags */ const __m256i rss_vlan_flag_bits =drivers/net/ice/ice_rxtx_vec_sse.c +2
-3@@ -114,39 +114,67 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq,__m128i descs[4], * bit12 for RSS indication. * bit13 for VLAN indication. */ -const __m128i desc_mask =_mm_set_epi32 (0x3070 ,0x3070 , -0x3070 ,0x3070 ); - +const __m128i desc_mask =_mm_set_epi32 (0x30f0 ,0x30f0 , +0x30f0 ,0x30f0 ); const __m128i cksum_mask =_mm_set_epi32(PKT_RX_IP_CKSUM_MASK |
drivers/net/ice/ice_rxtx_vec_sse.c +1
-0PKT_RX_L4_CKSUM_MASK | +
PKT_RX_OUTER_L4_CKSUM_MASK|drivers/net/ice/ice_rxtx_vec_sse.c +1
-0PKT_RX_EIP_CKSUM_BAD ,PKT_RX_IP_CKSUM_MASK | PKT_RX_L4_CKSUM_MASK | +
PKT_RX_OUTER_L4_CKSUM_MASK|drivers/net/ice/ice_rxtx_vec_sse.c +1
-0PKT_RX_EIP_CKSUM_BAD ,PKT_RX_IP_CKSUM_MASK | PKT_RX_L4_CKSUM_MASK | +
PKT_RX_OUTER_L4_CKSUM_MASK|drivers/net/ice/ice_rxtx_vec_sse.c +1
-0PKT_RX_EIP_CKSUM_BAD ,PKT_RX_IP_CKSUM_MASK | PKT_RX_L4_CKSUM_MASK | +
PKT_RX_OUTER_L4_CKSUM_MASK|drivers/net/ice/ice_rxtx_vec_sse.c +0
-3PKT_RX_EIP_CKSUM_BAD);/* map the checksum, rss and vlan fields to the checksum, rss * and vlan flag */ - const __m128i cksum_flags = _mm_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|drivers/net/ice/ice_rxtx_vec_sse.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_sse.c +0
-1- (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_sse.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_sse.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_GOOD) >> 1);drivers/net/ice/ice_rxtx_vec_sse.c +5
-0+const __m128i cksum_flags = + _mm_set_epi8((PKT_RX_OUTER_L4_CKSUM_BAD >> 20 | + PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD | + PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +7
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + /** + * shift right 20 bits to use the low two bits to indicate + * outer checksum status + * shift right 1 bit to make sure it not exceed 255 + */ + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +9
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1); const __m128i rss_vlan_flags = _mm_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,@@ -166,6 +194,14 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq,__m128i descs[4 ], flags =_mm_shuffle_epi8 (cksum_flags, tmp_desc);/* then we shift left 1 bit */ flags =_mm_slli_epi32 (flags,1 ); + +__m128i l4_outer_mask =_mm_set_epi32 (0x6 ,0x6 ,0x6 ,0x6 ); +__m128i l4_outer_flags =_mm_and_si128 (flags, l4_outer_mask); + l4_outer_flags =_mm_slli_epi32 (l4_outer_flags,20 ); + +__m128i l3_l4_mask =_mm_set_epi32 (~0x6 , ~0x6 , ~0x6 , ~0x6 ); +__m128i l3_l4_flags =_mm_and_si128 (flags, l3_l4_mask); + flags =_mm_or_si128 (l3_l4_flags, l4_outer_flags);/* we need to mask out the reduntant bits introduced by RSS or * VLAN fields. drivers/net/ice/ice_rxtx_vec_sse.c +0
-4*/ @@ -217,10 +253,10 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq,__m128i descs[4], * appropriate flags means that we have to do a shift and blend for * each mbuf before we do the write. */ - rearm0 =_mm_blend_epi16 (mbuf_init,_mm_slli_si128 (flags,8 ), 0x10); - rearm1 =_mm_blend_epi16 (mbuf_init,_mm_slli_si128 (flags,4 ), 0x10); - rearm2 =_mm_blend_epi16 (mbuf_init, flags,0x10 ); - rearm3 = _mm_blend_epi16(mbuf_init, _mm_srli_si128(flags, 4),
0x10);drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ rearm0 = _mm_blend_epi32(mbuf_init, _mm_slli_si128(flags, 8),
0x04);drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ rearm1 = _mm_blend_epi32(mbuf_init, _mm_slli_si128(flags, 4),
0x04);drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ rearm2 =_mm_blend_epi32 (mbuf_init, flags,0x04 ); + rearm3 = _mm_blend_epi32(mbuf_init, _mm_srli_si128(flags, 4),
0x04);drivers/net/ice/ice_rxtx_vec_sse.c +0
-1/* write the rearm data and the olflags in one write */ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, ol_flags) != --2.17.1
Re: [dpdk-dev] [PATCH v6] net/ice: fix outer checksum on cvl unknown
Quoted 12 lines
-----Original Message-----
From: Xie, WeiX <[email protected]>
Sent: Friday, November 13, 2020 11:16 AM
To: Yang, MurphyX <[email protected]>; [email protected]
Cc: Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>; Yang, SteveX <[email protected]>; Rong, Leyi <[email protected]>; Lu, Wenzhuo <[email protected]>; Yang, MurphyX <[email protected]>
Subject: RE: [dpdk-dev] [PATCH v6] net/ice: fix outer checksum on cvl unknown
Quoted 31 lines
Tested-by Xie,WeiX < [email protected]>Regards,
Xie WeiQuoted 25 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Murphy Yang
Sent: Monday, November 9, 2020 2:07 PM
To: [email protected]
Cc: Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>; Yang, SteveX <[email protected]>; Rong, Leyi <[email protected]>; Lu, Wenzhuo <[email protected]>; Yang, MurphyX <[email protected]>
Subject: [dpdk-dev] [PATCH v6] net/ice: fix outer checksum on cvl unknownCurrently, driver does not support parse UDP outer checksum flag of tunneled packets.
When execute 'csum set outer-udp hw 0' and 'csum parse-tunnel on 0' commands to enable hardware UDP outer checksum. This patch supports parse UDP outer checksum flag of tunneled packets.
Fixes dbf3c0e77a22 ("net/ice: handle Rx flex descriptor")Fixes 4ab7dbb0a0f6 ("net/ice: switch to Rx flexible descriptor in AVXpath")
Fixes ece1f8a8f1c8 ("net/ice: switch to flexible descriptor in SSEpath")
Signed-off-by Murphy Yang <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi
Re: [dpdk-dev] [PATCH v6] net/ice: fix outer checksum on cvl unknown
In reply to Murphy YangQuoted 12 lines · Murphy Yang
Currently, driver does not support parse UDP outer checksum flag of tunneled packets.
When execute 'csum set outer-udp hw 0' and 'csum parse-tunnel on 0' commands to enable hardware UDP outer checksum. This patch supports parse UDP outer checksum flag of tunneled packets.
Fixes dbf3c0e77a22 ("net/ice: handle Rx flex descriptor")Fixes 4ab7dbb0a0f6 ("net/ice: switch to Rx flexible descriptor in AVX path")Fixes ece1f8a8f1c8 ("net/ice: switch to flexible descriptor in SSE path")Signed-off-by Murphy Yang <[email protected]>
<...>
drivers/net/ice/ice_rxtx_vec_sse.c ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq, __m128i descs[4], · line 259
Quoted 12 lines
drivers/net/ice/ice_rxtx_vec_sse.c +4
-4@@ -217,10 +253,10 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq, __m128i descs[4],* appropriate flags means that we have to do a shift and blend for * each mbuf before we do the write. */ - rearm0 =_mm_blend_epi16 (mbuf_init,_mm_slli_si128 (flags,8 ),0x10 ); - rearm1 =_mm_blend_epi16 (mbuf_init,_mm_slli_si128 (flags,4 ),0x10 ); - rearm2 =_mm_blend_epi16 (mbuf_init, flags,0x10 ); - rearm3 =_mm_blend_epi16 (mbuf_init,_mm_srli_si128 (flags,4 ),0x10 ); + rearm0 =_mm_blend_epi32 (mbuf_init,_mm_slli_si128 (flags,8 ),0x04 ); + rearm1 =_mm_blend_epi32 (mbuf_init,_mm_slli_si128 (flags,4 ),0x04 ); + rearm2 =_mm_blend_epi32 (mbuf_init, flags,0x04 ); + rearm3 =_mm_blend_epi32 (mbuf_init,_mm_srli_si128 (flags,4 ),0x04 );
Hi Murphy,
This change is in the 'ice_rxtx_vec_sse.c' file, but is the '_mm_blend_epi32' intrinsic, an SSE intrinsic? Since it is causing a compile error with default target, you can test with './devtools/test-meson-builds.sh' script.
PATCH v7 1/1 net/ice: fix outer checksum on cvl unknown
In reply to Murphy YangWhen received tunneled packets, the testpmd output log shows 'ol_flags' value always is 'PKT_RX_OUTER_L4_CKSUM_UNKNOWN', but expected value is 'PKT_RX_OUTER_L4_CKSUM_GOOD' or 'PKT_RX_OUTER_L4_CKSUM_BAD'.
Add the 'PKT_RX_OUTER_L4_CKSUM_GOOD' and 'PKT_RX_OUTER_L4_CKSUM_BAD' to 'flags' for normal path, 'l3_l4_flags_shuf' for AVX2 and AVX512 vector path and 'cksum_flags' for SSE vector path to ensure that the 'ol_flags' can match correct flags.
---
v7:
- fix compile error with default target on SSE vector path. v6:
- rename variable name.
- update comments.
v5:
- fix outer L4 checksum mask for vector path.
v4:
- cover AVX512 vector path.
v3:
- add PKT_RX_OUTER_L4_CKSUM_GOOD in AVX2 and SSE vector path.
- rename variable name.
v2:
- cover AVX2 and SSE vector path
drivers/net/ice/ice_rxtx.c | 5 ++ drivers/net/ice/ice_rxtx_vec_avx2.c | 118 +++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_avx512.c | 117 ++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_sse.c | 78 ++++++++++++----- 4 files changed, 233 insertions(+), 85 deletions(-)
drivers/net/ice/ice_rxtx.c +5 -0
@@ -1451,6 +1451,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags; }
drivers/net/ice/ice_rxtx_vec_avx2.c +86 -32
135 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_avx512.c +85 -32
134 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_sse.c +57 -21
112 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v7] net/ice: fix outer checksum on cvl unknown
Regards,
Xie Wei
Quoted 627 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Murphy Yang
Sent: Monday, November 23, 2020 4:35 PM
To: [email protected]
Cc: Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>; Yang, SteveX <[email protected]>; Rong, Leyi <[email protected]>; Lu, Wenzhuo <[email protected]>; Yang, MurphyX <[email protected]>
Subject: [dpdk-dev] [PATCH v7] net/ice: fix outer checksum on cvl unknownWhen received tunneled packets, the testpmd output log shows '
ol_flags' value always is 'PKT_RX_OUTER_L4_CKSUM_UNKNOWN', but expected value is 'PKT_RX_OUTER_L4_CKSUM_GOOD' or 'PKT_RX_OUTER_L4_CKSUM_BAD'.Add the '
PKT_RX_OUTER_L4_CKSUM_GOOD' and 'PKT_RX_OUTER_L4_CKSUM_BAD' to 'flags' for normal path, 'l3_l4_flags_shuf' for AVX2 and AVX512 vector path and 'cksum_flags' for SSE vector path to ensure that the 'ol_flags'
can match correct flags.Fixes dbf3c0e77a22 ("net/ice: handle Rx flex descriptor")Fixes 4ab7dbb0a0f6 ("net/ice: switch to Rx flexible descriptor in AVX path")Fixes ece1f8a8f1c8 ("net/ice: switch to flexible descriptor in SSE path")Signed-off-by Murphy Yang <[email protected]>---
v7:
- fix compile error with default target on SSE vector path. v6:
- rename variable name.
- update comments.
v5:
- fix outer L4 checksum mask for vector path.
v4:
- cover AVX512 vector path.
v3:
- addPKT_RX_OUTER_L4_CKSUM_GOODin AVX2 and SSE vector path.
- rename variable name.
v2:
- cover AVX2 and SSE vector pathdrivers/net/ice/ice_rxtx.c | 5 ++ drivers/net/ice/ice_rxtx_vec_avx2.c | 118 +++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_avx512.c | 117 ++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_sse.c | 78 ++++++++++++----- 4 files changed, 233 insertions(+), 85 deletions(-)drivers/net/ice/ice_rxtx.c index renamed from drivers/net/ice/ice_rxtx.c +0
-0
5fbd68eafc..24a7caeb98100644drivers/net/ice/ice_rxtx.c +5
-0@@ -1451,6 +1451,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags;}
drivers/net/ice/ice_rxtx_vec_avx2.c +1
-4@@ -251,43 +251,88 @@ _ice_recv_raw_pkts_vec_avx2(structice_rx_queue *rxq, struct rte_mbuf **rx_pkts, * bit13 is for VLAN indication. */ const __m256i flags_mask = -_mm256_set1_epi32 ((7 <<4 ) | (1 <<12 ) | (1 <<13 )); +_mm256_set1_epi32 ((0xF <<4 ) | (1 <<12 ) | (1 <<13 ));/** * data to be shuffled by the result of the flags mask shifted by 4 * bits. This gives use the l3_l4 flags. */ - 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|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-3-/* second 128-bits */ - 0, 0, 0, 0, 0, 0, 0, 0, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_GOOD) >> 1);drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+const __m256i l3_l4_flags_shuf = + _mm256_set_epi8((PKT_RX_OUTER_L4_CKSUM_BAD >> 20|
drivers/net/ice/ice_rxtx_vec_avx2.c +3
-0+PKT_RX_EIP_CKSUM_BAD |PKT_RX_L4_CKSUM_BAD | + PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +8
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + /** + * second 128-bits + * shift right 20 bits to use the low two bits to indicate + * outer checksum status + * shift right 1 bit to make sure it not exceed 255 + */ + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx2.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx2.c +1
-1+ PKT_RX_IP_CKSUM_GOOD) >> 1); const __m256i cksum_mask = - _mm256_set1_epi32(PKT_RX_IP_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +0
-1- PKT_RX_L4_CKSUM_GOOD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx2.c +13
-1- PKT_RX_EIP_CKSUM_BAD); +_mm256_set1_epi32 (PKT_RX_IP_CKSUM_MASK | +PKT_RX_L4_CKSUM_MASK | +PKT_RX_EIP_CKSUM_BAD | +PKT_RX_OUTER_L4_CKSUM_MASK );/** * data to be shuffled by result of flag mask, shifted down 12. * If RSS(bit12)/VLAN(bit13) are set, @@ -469,6 +514,15 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, __m256i l3_l4_flags =_mm256_shuffle_epi8 (l3_l4_flags_shuf,_mm256_srli_epi32 (flag_bits,4 )); l3_l4_flags =_mm256_slli_epi32 (l3_l4_flags,1 ); + +__m256i l4_outer_mask =_mm256_set1_epi32 (0x6 ); +__m256i l4_outer_flags = +_mm256_and_si256 (l3_l4_flags, l4_outer_mask); + l4_outer_flags =_mm256_slli_epi32 (l4_outer_flags,20 ); + +__m256i l3_l4_mask =_mm256_set1_epi32 (~0x6 ); + l3_l4_flags =_mm256_and_si256 (l3_l4_flags, l3_l4_mask); + l3_l4_flags =_mm256_or_si256 (l3_l4_flags, l4_outer_flags);drivers/net/ice/ice_rxtx_vec_avx2.c +0
-0l3_l4_flags =_mm256_and_si256 (l3_l4_flags, cksum_mask);/* set rss and vlan flags */ const __m256i rss_vlan_flag_bits =drivers/net/ice/ice_rxtx_vec_avx512.c +1
-4@@ -230,43 +230,88 @@ _ice_recv_raw_pkts_vec_avx512(structice_rx_queue *rxq, * bit13 is for VLAN indication. */ const __m256i flags_mask = -_mm256_set1_epi32 ((7 <<4 ) | (1 <<12 ) | (1 <<13 )); +_mm256_set1_epi32 ((0xF <<4 ) | (1 <<12 ) | (1 <<13 ));/** * data to be shuffled by the result of the flags mask shifted by 4 * bits. This gives use the l3_l4 flags. */ - 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|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-3-/* 2nd 128-bits */ - 0, 0, 0, 0, 0, 0, 0, 0, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_GOOD) >> 1);drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+const __m256i l3_l4_flags_shuf = + _mm256_set_epi8((PKT_RX_OUTER_L4_CKSUM_BAD >> 20|
drivers/net/ice/ice_rxtx_vec_avx512.c +3
-0+PKT_RX_EIP_CKSUM_BAD |PKT_RX_L4_CKSUM_BAD | + PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +8
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + /** + * second 128-bits + * shift right 20 bits to use the low two bits to indicate + * outer checksum status + * shift right 1 bit to make sure it not exceed 255 + */ + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_avx512.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_avx512.c +1
-1+ PKT_RX_IP_CKSUM_GOOD) >> 1); const __m256i cksum_mask = - _mm256_set1_epi32(PKT_RX_IP_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +0
-1- PKT_RX_L4_CKSUM_GOOD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_avx512.c +12
-1- PKT_RX_EIP_CKSUM_BAD); +_mm256_set1_epi32 (PKT_RX_IP_CKSUM_MASK | +PKT_RX_L4_CKSUM_MASK | +PKT_RX_EIP_CKSUM_BAD | +PKT_RX_OUTER_L4_CKSUM_MASK );/** * data to be shuffled by result of flag mask, shifted down 12. * If RSS(bit12)/VLAN(bit13) are set, @@ -451,6 +496,14 @@ _ice_recv_raw_pkts_vec_avx512(structice_rx_queue *rxq, __m256i l3_l4_flags =_mm256_shuffle_epi8 (l3_l4_flags_shuf,_mm256_srli_epi32 (flag_bits,4 )); l3_l4_flags =_mm256_slli_epi32 (l3_l4_flags,1 ); +__m256i l4_outer_mask =_mm256_set1_epi32 (0x6 ); +__m256i l4_outer_flags = +_mm256_and_si256 (l3_l4_flags, l4_outer_mask); + l4_outer_flags =_mm256_slli_epi32 (l4_outer_flags,20 ); + +__m256i l3_l4_mask =_mm256_set1_epi32 (~0x6 ); + l3_l4_flags =_mm256_and_si256 (l3_l4_flags, l3_l4_mask); + l3_l4_flags =_mm256_or_si256 (l3_l4_flags, l4_outer_flags);drivers/net/ice/ice_rxtx_vec_avx512.c +0
-0l3_l4_flags =_mm256_and_si256 (l3_l4_flags, cksum_mask);/* set rss and vlan flags */ const __m256i rss_vlan_flag_bits =drivers/net/ice/ice_rxtx_vec_sse.c +2
-3@@ -114,39 +114,67 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq,__m128i descs[4], * bit12 for RSS indication. * bit13 for VLAN indication. */ -const __m128i desc_mask =_mm_set_epi32 (0x3070 ,0x3070 , -0x3070 ,0x3070 ); - +const __m128i desc_mask =_mm_set_epi32 (0x30f0 ,0x30f0 , +0x30f0 ,0x30f0 ); const __m128i cksum_mask =_mm_set_epi32(PKT_RX_IP_CKSUM_MASK |
drivers/net/ice/ice_rxtx_vec_sse.c +1
-0PKT_RX_L4_CKSUM_MASK | +
PKT_RX_OUTER_L4_CKSUM_MASK|drivers/net/ice/ice_rxtx_vec_sse.c +1
-0PKT_RX_EIP_CKSUM_BAD ,PKT_RX_IP_CKSUM_MASK | PKT_RX_L4_CKSUM_MASK | +
PKT_RX_OUTER_L4_CKSUM_MASK|drivers/net/ice/ice_rxtx_vec_sse.c +1
-0PKT_RX_EIP_CKSUM_BAD ,PKT_RX_IP_CKSUM_MASK | PKT_RX_L4_CKSUM_MASK | +
PKT_RX_OUTER_L4_CKSUM_MASK|drivers/net/ice/ice_rxtx_vec_sse.c +1
-0PKT_RX_EIP_CKSUM_BAD ,PKT_RX_IP_CKSUM_MASK | PKT_RX_L4_CKSUM_MASK | +
PKT_RX_OUTER_L4_CKSUM_MASK|drivers/net/ice/ice_rxtx_vec_sse.c +0
-3PKT_RX_EIP_CKSUM_BAD);/* map the checksum, rss and vlan fields to the checksum, rss * and vlan flag */ - const __m128i cksum_flags = _mm_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|drivers/net/ice/ice_rxtx_vec_sse.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +0
-2- PKT_RX_IP_CKSUM_BAD) >> 1, - (PKT_RX_EIP_CKSUM_BAD |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +0
-2- PKT_RX_IP_CKSUM_GOOD) >> 1, - (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_sse.c +0
-1- (PKT_RX_L4_CKSUM_BAD |
PKT_RX_IP_CKSUM_GOOD) >> 1,drivers/net/ice/ice_rxtx_vec_sse.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_BAD) >> 1,drivers/net/ice/ice_rxtx_vec_sse.c +0
-1- (PKT_RX_L4_CKSUM_GOOD |
PKT_RX_IP_CKSUM_GOOD) >> 1);drivers/net/ice/ice_rxtx_vec_sse.c +5
-0+const __m128i cksum_flags = + _mm_set_epi8((PKT_RX_OUTER_L4_CKSUM_BAD >> 20 | + PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD | + PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_BAD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +7
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + /** + * shift right 20 bits to use the low two bits to indicate + * outer checksum status + * shift right 1 bit to make sure it not exceed 255 + */ + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_EIP_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >>1,
drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_BAD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ PKT_RX_IP_CKSUM_BAD) >> 1, + (PKT_RX_OUTER_L4_CKSUM_GOOD >> 20 |
PKT_RX_L4_CKSUM_GOOD|drivers/net/ice/ice_rxtx_vec_sse.c +9
-0+ PKT_RX_IP_CKSUM_GOOD) >> 1); const __m128i rss_vlan_flags = _mm_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,@@ -166,6 +194,14 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq,__m128i descs[4 ], flags =_mm_shuffle_epi8 (cksum_flags, tmp_desc);/* then we shift left 1 bit */ flags =_mm_slli_epi32 (flags,1 ); + +__m128i l4_outer_mask =_mm_set_epi32 (0x6 ,0x6 ,0x6 ,0x6 ); +__m128i l4_outer_flags =_mm_and_si128 (flags, l4_outer_mask); + l4_outer_flags =_mm_slli_epi32 (l4_outer_flags,20 ); + +__m128i l3_l4_mask =_mm_set_epi32 (~0x6 , ~0x6 , ~0x6 , ~0x6 ); +__m128i l3_l4_flags =_mm_and_si128 (flags, l3_l4_mask); + flags =_mm_or_si128 (l3_l4_flags, l4_outer_flags);/* we need to mask out the reduntant bits introduced by RSS or * VLAN fields. drivers/net/ice/ice_rxtx_vec_sse.c +0
-4*/ @@ -217,10 +253,10 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq,__m128i descs[4], * appropriate flags means that we have to do a shift and blend for * each mbuf before we do the write. */ - rearm0 =_mm_blend_epi16 (mbuf_init,_mm_slli_si128 (flags,8 ), 0x10); - rearm1 =_mm_blend_epi16 (mbuf_init,_mm_slli_si128 (flags,4 ), 0x10); - rearm2 =_mm_blend_epi16 (mbuf_init, flags,0x10 ); - rearm3 = _mm_blend_epi16(mbuf_init, _mm_srli_si128(flags, 4),
0x10);drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ rearm0 = _mm_blend_epi16(mbuf_init, _mm_slli_si128(flags, 8),
0x30);drivers/net/ice/ice_rxtx_vec_sse.c +1
-0+ rearm1 = _mm_blend_epi16(mbuf_init, _mm_slli_si128(flags, 4),
0x30);drivers/net/ice/ice_rxtx_vec_sse.c +2
-0+ rearm2 =_mm_blend_epi16 (mbuf_init, flags,0x30 ); + rearm3 = _mm_blend_epi16(mbuf_init, _mm_srli_si128(flags, 4),
0x30);drivers/net/ice/ice_rxtx_vec_sse.c +0
-1/* write the rearm data and the olflags in one write */ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, ol_flags) != --2.17.1
PATCH v8 1/1 net/ice: fix outer checksum unknown
In reply to Murphy YangWhen received tunneled packets, the testpmd output log shows 'ol_flags' value always is 'PKT_RX_OUTER_L4_CKSUM_UNKNOWN', but expected value is 'PKT_RX_OUTER_L4_CKSUM_GOOD' or 'PKT_RX_OUTER_L4_CKSUM_BAD'.
Add the 'PKT_RX_OUTER_L4_CKSUM_GOOD' and 'PKT_RX_OUTER_L4_CKSUM_BAD' to 'flags' for normal path, 'l3_l4_flags_shuf' for AVX2 and AVX512 vector path and 'cksum_flags' for SSE vector path to ensure that the 'ol_flags' can match correct flags.
---
v8:
- tune the commit title.
v7:
- fix compile error with default target on SSE vector path. v6:
- rename variable name.
- update comments.
v5:
- fix outer L4 checksum mask for vector path.
v4:
- cover AVX512 vector path.
v3:
- add PKT_RX_OUTER_L4_CKSUM_GOOD in AVX2 and SSE vector path.
- rename variable name.
v2:
- cover AVX2 and SSE vector path
drivers/net/ice/ice_rxtx.c | 5 ++ drivers/net/ice/ice_rxtx_vec_avx2.c | 118 +++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_avx512.c | 117 ++++++++++++++++++------- drivers/net/ice/ice_rxtx_vec_sse.c | 78 ++++++++++++----- 4 files changed, 233 insertions(+), 85 deletions(-)
drivers/net/ice/ice_rxtx.c +5 -0
@@ -1451,6 +1451,11 @@ ice_rxd_error_to_pkt_flags(uint16_t stat_err0)if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=PKT_RX_EIP_CKSUM_BAD ; +if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + flags |=PKT_RX_OUTER_L4_CKSUM_BAD ; +else + flags |=PKT_RX_OUTER_L4_CKSUM_GOOD ; +return flags; }
drivers/net/ice/ice_rxtx_vec_avx2.c +86 -32
135 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_avx512.c +85 -32
134 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_sse.c +57 -21
112 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v8] net/ice: fix outer checksum unknown
Quoted 22 lines
-----Original Message-----
From: Murphy Yang <[email protected]>
Sent: Tuesday, December 15, 2020 4:11 PM
To: [email protected]
Cc: Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>; Yang, SteveX <[email protected]>; Rong, Leyi <[email protected]>; Lu, Wenzhuo <[email protected]>; Yigit, Ferruh <[email protected]>; Yang, MurphyX <[email protected]>
Subject: [PATCH v8] net/ice: fix outer checksum unknownWhen received tunneled packets, the testpmd output log shows '
ol_flags' value always is 'PKT_RX_OUTER_L4_CKSUM_UNKNOWN', but expected value is 'PKT_RX_OUTER_L4_CKSUM_GOOD' or 'PKT_RX_OUTER_L4_CKSUM_BAD'.Add the '
PKT_RX_OUTER_L4_CKSUM_GOOD' and 'PKT_RX_OUTER_L4_CKSUM_BAD' to 'flags' for normal path, 'l3_l4_flags_shuf' for AVX2 and AVX512 vector path and 'cksum_flags' for SSE vector path to ensure that the 'ol_flags'
can match correct flags.
Quoted 5 lines
Fixes dbf3c0e77a22 ("net/ice: handle Rx flex descriptor")Fixes 4ab7dbb0a0f6 ("net/ice: switch to Rx flexible descriptor in AVX path")Fixes ece1f8a8f1c8 ("net/ice: switch to flexible descriptor in SSE path")Signed-off-by Murphy Yang <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi