diff mbox series

[v2] net/ice: fix secondary process Rx offload path

Message ID 20211115020539.20468-1-alvinx.zhang@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Qi Zhang
Headers
Series [v2] net/ice: fix secondary process Rx offload path |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/github-robot: build success github build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Functional fail Functional Testing issues
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS

Commit Message

Alvin Zhang Nov. 15, 2021, 2:05 a.m. UTC 
  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 <alvinx.zhang@intel.com>
---
 drivers/net/ice/ice_ethdev.h |  1 +
 drivers/net/ice/ice_rxtx.c   | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

Comments

Qi Zhang Nov. 16, 2021, 1:21 a.m. UTC | #1 
> -----Original Message-----
> From: Zhang, AlvinX <alvinx.zhang@intel.com>
> Sent: Monday, November 15, 2021 10:06 AM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Rong, Leyi <leyi.rong@intel.com>
> Cc: dev@dpdk.org; Zhang, AlvinX <alvinx.zhang@intel.com>; stable@dpdk.org
> Subject: [PATCH v2] 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 <alvinx.zhang@intel.com>
> ---
>  drivers/net/ice/ice_ethdev.h |  1 +
>  drivers/net/ice/ice_rxtx.c   | 19 +++++++++++--------
>  2 files changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index
> 3a5bb9b..52daae0 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;
> +	int rx_vec_path;

Can we make the type/ name more specific, how about defined as: "bool rx_vec_offload_support;" ?

Then we can keep most thing unchanged in primary process branch, but only add below ,

ad->rx_vec_offload_support = (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH);


in following branch

we can avoid duplicate if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH)..


 

>  #endif
>  };
> 
> diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index
> 2d771ea..981493e 100644
> --- a/drivers/net/ice/ice_rxtx.c
> +++ b/drivers/net/ice/ice_rxtx.c
> @@ -3172,15 +3172,14 @@
>  #ifdef RTE_ARCH_X86
>  	struct ice_rx_queue *rxq;
>  	int i;
> -	int rx_check_ret = -1;
> 
>  	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
>  		ad->rx_use_avx512 = false;
>  		ad->rx_use_avx2 = false;
> -		rx_check_ret = ice_rx_vec_dev_check(dev);
> +		ad->rx_vec_path = ice_rx_vec_dev_check(dev);
>  		if (ad->ptp_ena)
> -			rx_check_ret = -1;
> -		if (rx_check_ret >= 0 && ad->rx_bulk_alloc_allowed &&
> +			ad->rx_vec_path = -1;
> +		if (ad->rx_vec_path >= 0 && ad->rx_bulk_alloc_allowed &&
>  		    rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
>  			ad->rx_vec_allowed = true;
>  			for (i = 0; i < dev->data->nb_rx_queues; i++) { @@ -3215,7
> +3214,8 @@
>  		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_path ==
> +				    ICE_VECTOR_OFFLOAD_PATH) {
>  					PMD_DRV_LOG(NOTICE,
>  						"Using AVX512 OFFLOAD Vector Scattered Rx
> (port %d).",
>  						dev->data->port_id);
> @@ -3230,7 +3230,8 @@
>  				}
>  #endif
>  			} else if (ad->rx_use_avx2) {
> -				if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
> +				if (ad->rx_vec_path ==
> +				    ICE_VECTOR_OFFLOAD_PATH) {
>  					PMD_DRV_LOG(NOTICE,
>  						    "Using AVX2 OFFLOAD Vector Scattered Rx
> (port %d).",
>  						    dev->data->port_id);
> @@ -3252,7 +3253,8 @@
>  		} else {
>  			if (ad->rx_use_avx512) {
>  #ifdef CC_AVX512_SUPPORT
> -				if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
> +				if (ad->rx_vec_path ==
> +				    ICE_VECTOR_OFFLOAD_PATH) {
>  					PMD_DRV_LOG(NOTICE,
>  						"Using AVX512 OFFLOAD Vector Rx (port %d).",
>  						dev->data->port_id);
> @@ -3267,7 +3269,8 @@
>  				}
>  #endif
>  			} else if (ad->rx_use_avx2) {
> -				if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
> +				if (ad->rx_vec_path ==
> +				    ICE_VECTOR_OFFLOAD_PATH) {
>  					PMD_DRV_LOG(NOTICE,
>  						    "Using AVX2 OFFLOAD Vector Rx
> (port %d).",
>  						    dev->data->port_id);
> --
> 1.8.3.1
Alvin Zhang Nov. 16, 2021, 2:12 a.m. UTC | #2 
> -----Original Message-----
> From: Zhang, Qi Z <qi.z.zhang@intel.com>
> Sent: Tuesday, November 16, 2021 9:22 AM
> To: Zhang, AlvinX <alvinx.zhang@intel.com>; Rong, Leyi <leyi.rong@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: RE: [PATCH v2] net/ice: fix secondary process Rx offload path
> 
> 
> 
> > -----Original Message-----
> > From: Zhang, AlvinX <alvinx.zhang@intel.com>
> > Sent: Monday, November 15, 2021 10:06 AM
> > To: Zhang, Qi Z <qi.z.zhang@intel.com>; Rong, Leyi
> > <leyi.rong@intel.com>
> > Cc: dev@dpdk.org; Zhang, AlvinX <alvinx.zhang@intel.com>;
> > stable@dpdk.org
> > Subject: [PATCH v2] 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 <alvinx.zhang@intel.com>
> > ---
> >  drivers/net/ice/ice_ethdev.h |  1 +
> >  drivers/net/ice/ice_rxtx.c   | 19 +++++++++++--------
> >  2 files changed, 12 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/net/ice/ice_ethdev.h
> > b/drivers/net/ice/ice_ethdev.h index
> > 3a5bb9b..52daae0 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;
> > +int rx_vec_path;
> 
> Can we make the type/ name more specific, how about defined as: "bool
> rx_vec_offload_support;" ?
> 
> Then we can keep most thing unchanged in primary process branch, but only
> add below ,
> 
> ad->rx_vec_offload_support = (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH);
> 
> 
> in following branch
> 
> we can avoid duplicate if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH)..
> 

Ok, I'll update it in V3.

> 
> 
> 
> >  #endif
> >  };
> >
> > diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
> > index 2d771ea..981493e 100644
> > --- a/drivers/net/ice/ice_rxtx.c
> > +++ b/drivers/net/ice/ice_rxtx.c
> > @@ -3172,15 +3172,14 @@
> >  #ifdef RTE_ARCH_X86
> >  struct ice_rx_queue *rxq;
> >  int i;
> > -int rx_check_ret = -1;
> >
> >  if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
> >  ad->rx_use_avx512 = false;
> >  ad->rx_use_avx2 = false;
> > -rx_check_ret = ice_rx_vec_dev_check(dev);
> > +ad->rx_vec_path = ice_rx_vec_dev_check(dev);
> >  if (ad->ptp_ena)
> > -rx_check_ret = -1;
> > -if (rx_check_ret >= 0 && ad->rx_bulk_alloc_allowed &&
> > +ad->rx_vec_path = -1;
> > +if (ad->rx_vec_path >= 0 && ad->rx_bulk_alloc_allowed &&
> >      rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
> > ad->rx_vec_allowed = true;  for (i = 0; i < dev->data->nb_rx_queues;
> > i++) { @@ -3215,7
> > +3214,8 @@
> >  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_path ==
> > +    ICE_VECTOR_OFFLOAD_PATH) {
> >  PMD_DRV_LOG(NOTICE,
> >  "Using AVX512 OFFLOAD Vector Scattered Rx (port %d).",
> > dev->data->port_id); @@ -3230,7 +3230,8 @@  }  #endif  } else if
> > (ad->rx_use_avx2) { -if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
> > +if (ad->rx_vec_path ==
> > +    ICE_VECTOR_OFFLOAD_PATH) {
> >  PMD_DRV_LOG(NOTICE,
> >      "Using AVX2 OFFLOAD Vector Scattered Rx (port %d).",
> >      dev->data->port_id);
> > @@ -3252,7 +3253,8 @@
> >  } else {
> >  if (ad->rx_use_avx512) {
> >  #ifdef CC_AVX512_SUPPORT
> > -if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
> > +if (ad->rx_vec_path ==
> > +    ICE_VECTOR_OFFLOAD_PATH) {
> >  PMD_DRV_LOG(NOTICE,
> >  "Using AVX512 OFFLOAD Vector Rx (port %d).",  dev->data->port_id); @@
> > -3267,7 +3269,8 @@  }  #endif  } else if (ad->rx_use_avx2) { -if
> > (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
> > +if (ad->rx_vec_path ==
> > +    ICE_VECTOR_OFFLOAD_PATH) {
> >  PMD_DRV_LOG(NOTICE,
> >      "Using AVX2 OFFLOAD Vector Rx
> > (port %d).",
> >      dev->data->port_id);
> > --
> > 1.8.3.1
>
diff mbox series

Patch

diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 3a5bb9b..52daae0 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;
+	int rx_vec_path;
 #endif
 };
 
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 2d771ea..981493e 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -3172,15 +3172,14 @@ 
 #ifdef RTE_ARCH_X86
 	struct ice_rx_queue *rxq;
 	int i;
-	int rx_check_ret = -1;
 
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
 		ad->rx_use_avx512 = false;
 		ad->rx_use_avx2 = false;
-		rx_check_ret = ice_rx_vec_dev_check(dev);
+		ad->rx_vec_path = ice_rx_vec_dev_check(dev);
 		if (ad->ptp_ena)
-			rx_check_ret = -1;
-		if (rx_check_ret >= 0 && ad->rx_bulk_alloc_allowed &&
+			ad->rx_vec_path = -1;
+		if (ad->rx_vec_path >= 0 && ad->rx_bulk_alloc_allowed &&
 		    rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
 			ad->rx_vec_allowed = true;
 			for (i = 0; i < dev->data->nb_rx_queues; i++) {
@@ -3215,7 +3214,8 @@ 
 		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_path ==
+				    ICE_VECTOR_OFFLOAD_PATH) {
 					PMD_DRV_LOG(NOTICE,
 						"Using AVX512 OFFLOAD Vector Scattered Rx (port %d).",
 						dev->data->port_id);
@@ -3230,7 +3230,8 @@ 
 				}
 #endif
 			} else if (ad->rx_use_avx2) {
-				if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
+				if (ad->rx_vec_path ==
+				    ICE_VECTOR_OFFLOAD_PATH) {
 					PMD_DRV_LOG(NOTICE,
 						    "Using AVX2 OFFLOAD Vector Scattered Rx (port %d).",
 						    dev->data->port_id);
@@ -3252,7 +3253,8 @@ 
 		} else {
 			if (ad->rx_use_avx512) {
 #ifdef CC_AVX512_SUPPORT
-				if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
+				if (ad->rx_vec_path ==
+				    ICE_VECTOR_OFFLOAD_PATH) {
 					PMD_DRV_LOG(NOTICE,
 						"Using AVX512 OFFLOAD Vector Rx (port %d).",
 						dev->data->port_id);
@@ -3267,7 +3269,8 @@ 
 				}
 #endif
 			} else if (ad->rx_use_avx2) {
-				if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
+				if (ad->rx_vec_path ==
+				    ICE_VECTOR_OFFLOAD_PATH) {
 					PMD_DRV_LOG(NOTICE,
 						    "Using AVX2 OFFLOAD Vector Rx (port %d).",
 						    dev->data->port_id);