From 798155194c2ba7458e2faf3c0754134ce54aeeed Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Tue, 16 Nov 2021 10:32:09 +0800 Subject: [PATCH] net/ice: fix secondary process Rx offload path Secondary process depends on the vector offload flag to select right Rx offload path. This patch adds a variable in share memory to store the vector offload flag that can be directly read by secondary process. Fixes: 808a17b3c1e6 ("net/ice: add Rx AVX512 offload path") Cc: stable@dpdk.org Signed-off-by: Alvin Zhang Tested-by: Qin Sun Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.h | 1 + drivers/net/ice/ice_rxtx.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index 3a5bb9bbc6..f8d0f0c6ee 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -538,6 +538,7 @@ struct ice_adapter { bool rx_use_avx512; bool tx_use_avx2; bool tx_use_avx512; + bool rx_vec_offload_support; #endif }; diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 2d771eab0c..f6d8564ab8 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3180,6 +3180,8 @@ ice_set_rx_function(struct rte_eth_dev *dev) rx_check_ret = ice_rx_vec_dev_check(dev); if (ad->ptp_ena) rx_check_ret = -1; + ad->rx_vec_offload_support = + (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH); if (rx_check_ret >= 0 && ad->rx_bulk_alloc_allowed && rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) { ad->rx_vec_allowed = true; @@ -3215,7 +3217,7 @@ ice_set_rx_function(struct rte_eth_dev *dev) if (dev->data->scattered_rx) { if (ad->rx_use_avx512) { #ifdef CC_AVX512_SUPPORT - if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) { + if (ad->rx_vec_offload_support) { PMD_DRV_LOG(NOTICE, "Using AVX512 OFFLOAD Vector Scattered Rx (port %d).", dev->data->port_id); @@ -3230,7 +3232,7 @@ ice_set_rx_function(struct rte_eth_dev *dev) } #endif } else if (ad->rx_use_avx2) { - if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) { + if (ad->rx_vec_offload_support) { PMD_DRV_LOG(NOTICE, "Using AVX2 OFFLOAD Vector Scattered Rx (port %d).", dev->data->port_id); @@ -3252,7 +3254,7 @@ ice_set_rx_function(struct rte_eth_dev *dev) } else { if (ad->rx_use_avx512) { #ifdef CC_AVX512_SUPPORT - if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) { + if (ad->rx_vec_offload_support) { PMD_DRV_LOG(NOTICE, "Using AVX512 OFFLOAD Vector Rx (port %d).", dev->data->port_id); @@ -3267,7 +3269,7 @@ ice_set_rx_function(struct rte_eth_dev *dev) } #endif } else if (ad->rx_use_avx2) { - if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) { + if (ad->rx_vec_offload_support) { PMD_DRV_LOG(NOTICE, "Using AVX2 OFFLOAD Vector Rx (port %d).", dev->data->port_id); -- 2.39.5