Two rx paths had incorrect feature and offload definitions
which led to incorrect path selections. Fix these.
Remove timestamp offload from the list of offloads
supported by paths that use the flexible rx descriptor. It
is only available in the "offload" versions of those paths.
Fixes: 91e3205d72d8 ("net/iavf: use common Rx path selection infrastructure")
Cc: [email protected]
Signed-off-by: Ciara Loftus <[email protected]>
---
drivers/net/intel/iavf/iavf_rxtx.c | 5 +++--
drivers/net/intel/iavf/iavf_rxtx.h | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/intel/iavf/iavf_rxtx.c
b/drivers/net/intel/iavf/iavf_rxtx.c
index 775fb4a66f..67c73f9ad6 100644
--- a/drivers/net/intel/iavf/iavf_rxtx.c
+++ b/drivers/net/intel/iavf/iavf_rxtx.c
@@ -3768,13 +3768,14 @@ static const struct ci_rx_path_info
iavf_rx_path_infos[] = {
{.scattered = true, .flex_desc = true, .bulk_alloc =
true}}},
[IAVF_RX_AVX2_FLEX_RXD_OFFLOAD] = {
iavf_recv_pkts_vec_avx2_flex_rxd_offload, "Vector AVX2 Flex
Offload",
- {IAVF_RX_VECTOR_OFFLOADS, RTE_VECT_SIMD_256,
+ {IAVF_RX_VECTOR_OFFLOAD_FLEX_OFFLOADS,
RTE_VECT_SIMD_256,
{.flex_desc = true, .bulk_alloc = true}}},
[IAVF_RX_AVX2_SCATTERED_FLEX_RXD_OFFLOAD] = {
iavf_recv_scattered_pkts_vec_avx2_flex_rxd_offload,
"Vector Scattered AVX2 Flex Offload",
{IAVF_RX_VECTOR_OFFLOAD_FLEX_OFFLOADS |
RTE_ETH_RX_OFFLOAD_SCATTER,
- RTE_VECT_SIMD_256, {.flex_desc = true, .bulk_alloc =
true}}},
+ RTE_VECT_SIMD_256,
+ {.scattered = true, .flex_desc = true, .bulk_alloc =
true}}},
#ifdef CC_AVX512_SUPPORT
[IAVF_RX_AVX512] = {iavf_recv_pkts_vec_avx512, "Vector AVX512",
{IAVF_RX_VECTOR_OFFLOADS, RTE_VECT_SIMD_512, {.bulk_alloc =
true}}},
diff --git a/drivers/net/intel/iavf/iavf_rxtx.h
b/drivers/net/intel/iavf/iavf_rxtx.h
index 3f461efb28..44be29caf6 100644
--- a/drivers/net/intel/iavf/iavf_rxtx.h
+++ b/drivers/net/intel/iavf/iavf_rxtx.h
@@ -83,7 +83,6 @@
/* vector paths that use the flex rx desc */
#define IAVF_RX_VECTOR_FLEX_OFFLOADS ( \
IAVF_RX_VECTOR_OFFLOADS | \
- RTE_ETH_RX_OFFLOAD_TIMESTAMP | \
RTE_ETH_RX_OFFLOAD_SECURITY)
/* vector offload paths */
#define IAVF_RX_VECTOR_OFFLOAD_OFFLOADS ( \
--
2.34.1
