net/ice: fix rx scalar path offload parse
PATCH v2 1/1 net/ice: fix rx scalar path offload parse
The status_0 field of the rx descriptor is incorrectly parsed as the error field, which causes the parsing error of offload features.
This patch is to fixe the parsing of wrong fields.
Fixes daa02b5cddbb ("mbuf: add namespace to offload flags")
Fixes dbf3c0e77a22 ("net/ice: handle Rx flex descriptor")
Signed-off-by Mingjin Ye <[email protected]>
--- drivers/net/ice/ice_rxtx.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/net/ice/ice_rxtx.c +10 -10
@@ -1485,36 +1485,36 @@ ice_rx_queue_count(void *rx_queue) (1 << ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S) | \ (1 << ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S) | \ (1 << ICE_RX_FLEX_DESC_STATUS0_RXE_S)) - +#define ICE_RXD_QW1_ERROR_SHIFT 19/* Rx L3/L4 checksum */ static inline uint64_t ice_rxd_error_to_pkt_flags (uint16_t stat_err0) {uint64_t flags =0 ; -/* check if HW has decoded the packet and checksum */ -if (unlikely (!(stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_L3L4P_S )))) -return 0 ; +uint64_t error_bits = (stat_err0 >>ICE_RXD_QW1_ERROR_SHIFT ) &0x7D ; -if (likely (!(stat_err0 &ICE_RX_FLEX_ERR0_BITS ))) { - flags |= (RTE_MBUF_F_RX_IP_CKSUM_GOOD |RTE_MBUF_F_RX_L4_CKSUM_GOOD ); +if (likely (!(error_bits &ICE_RX_FLEX_ERR0_BITS ))) { + flags |= (RTE_MBUF_F_RX_IP_CKSUM_GOOD | +RTE_MBUF_F_RX_L4_CKSUM_GOOD | +RTE_MBUF_F_RX_OUTER_L4_CKSUM_GOOD );return flags; } -if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_IPE_S ))) +if (unlikely (error_bits & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_IPE_S ))) flags |=RTE_MBUF_F_RX_IP_CKSUM_BAD ;else flags |=RTE_MBUF_F_RX_IP_CKSUM_GOOD ; -if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_L4E_S ))) +if (unlikely (error_bits & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_L4E_S ))) flags |=RTE_MBUF_F_RX_L4_CKSUM_BAD ;else flags |=RTE_MBUF_F_RX_L4_CKSUM_GOOD ; -if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) +if (unlikely (error_bits & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ))) flags |=RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD ; -if (unlikely (stat_err0 & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) +if (unlikely (error_bits & (1 <<ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) flags |=RTE_MBUF_F_RX_OUTER_L4_CKSUM_BAD ;else flags |=RTE_MBUF_F_RX_OUTER_L4_CKSUM_GOOD ;
Signature · 1 line
2.34.1