| Message ID | 20210524090759.980530-1-qi.z.zhang@intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Qi Zhang |
| Headers | show |
| Series | net/ice: fix wrong data path selection in secondary process | expand |
| Context | Check | Description |
|---|---|---|
| ci/iol-intel-Functional | success | Functional Testing PASS |
| ci/iol-mellanox-Performance | success | Performance Testing PASS |
| ci/intel-Testing | success | Testing PASS |
| ci/iol-mellanox-Functional | success | Functional Testing PASS |
| ci/iol-testing | fail | Testing issues |
| ci/Intel-compilation | success | Compilation OK |
| ci/iol-abi-testing | success | Testing PASS |
| ci/checkpatch | success | coding style OK |
Hi, Qi I've tested this patch and it works. Best Regards, Yixue. > -----Original Message----- > From: Zhang, Qi Z <qi.z.zhang@intel.com> > Sent: Monday, May 24, 2021 17:08 > To: Yang, Qiming <qiming.yang@intel.com> > Cc: Zhang, Liheng <liheng.zhang@intel.com>; Wang, Yixue > <yixue.wang@intel.com>; Dong, Yao <yao.dong@intel.com>; dev@dpdk.org; > Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org > Subject: [PATCH] net/ice: fix wrong data path selection in secondary process > > The flag use_avx2 and use_avx512 are defined as local variables, they will not be > aware by the secondary process, then wrong data path is selected. Fix the issue > by moving them into struct ice_adapter. > > Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") > Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx") > Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path") > Cc: stable@dpdk.org > > Reported-by: Yixue Wang <yixue.wang@intel.com> > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> > Tested-by: Yixue Wang <yixue.wang@intel.com> > --- > drivers/net/ice/ice_ethdev.h | 6 +++++ > drivers/net/ice/ice_rxtx.c | 44 ++++++++++++++++++------------------ > 2 files changed, 28 insertions(+), 22 deletions(-) > > diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index > 2a8a8169d5..aebfd1b0b7 100644 > --- a/drivers/net/ice/ice_ethdev.h > +++ b/drivers/net/ice/ice_ethdev.h > @@ -487,6 +487,12 @@ struct ice_adapter { > struct ice_devargs devargs; > enum ice_pkg_type active_pkg_type; /* loaded ddp package type */ > uint16_t fdir_ref_cnt; > +#ifdef RTE_ARCH_X86 > + bool rx_use_avx2; > + bool rx_use_avx512; > + bool tx_use_avx2; > + bool tx_use_avx512; > +#endif > }; > > struct ice_vsi_vlan_pvid_info { > diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index > 49abcb2f5c..f4f6f48d78 100644 > --- a/drivers/net/ice/ice_rxtx.c > +++ b/drivers/net/ice/ice_rxtx.c > @@ -3058,11 +3058,11 @@ ice_set_rx_function(struct rte_eth_dev *dev) > #ifdef RTE_ARCH_X86 > struct ice_rx_queue *rxq; > int i; > - int rx_check_ret; > - bool use_avx512 = false; > - bool use_avx2 = false; > + int rx_check_ret = 0; > > 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); > if (rx_check_ret >= 0 && ad->rx_bulk_alloc_allowed && > rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) > { @@ -3079,16 +3079,16 @@ ice_set_rx_function(struct rte_eth_dev *dev) > rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == > 1 && > rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512BW) > == 1) #ifdef CC_AVX512_SUPPORT > - use_avx512 = true; > + ad->rx_use_avx512 = true; > #else > PMD_DRV_LOG(NOTICE, > "AVX512 is not supported in build env"); #endif > - if (!use_avx512 && > + if (!ad->rx_use_avx512 && > (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 > || > rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == > 1) && > rte_vect_get_max_simd_bitwidth() >= > RTE_VECT_SIMD_256) > - use_avx2 = true; > + ad->rx_use_avx2 = true; > > } else { > ad->rx_vec_allowed = false; > @@ -3097,7 +3097,7 @@ ice_set_rx_function(struct rte_eth_dev *dev) > > if (ad->rx_vec_allowed) { > if (dev->data->scattered_rx) { > - if (use_avx512) { > + if (ad->rx_use_avx512) { > #ifdef CC_AVX512_SUPPORT > if (rx_check_ret == > ICE_VECTOR_OFFLOAD_PATH) { > PMD_DRV_LOG(NOTICE, > @@ -3116,14 +3116,14 @@ ice_set_rx_function(struct rte_eth_dev *dev) > } else { > PMD_DRV_LOG(DEBUG, > "Using %sVector Scattered Rx > (port %d).", > - use_avx2 ? "avx2 " : "", > + ad->rx_use_avx2 ? "avx2 " : "", > dev->data->port_id); > - dev->rx_pkt_burst = use_avx2 ? > + dev->rx_pkt_burst = ad->rx_use_avx2 ? > ice_recv_scattered_pkts_vec_avx2 : > ice_recv_scattered_pkts_vec; > } > } else { > - if (use_avx512) { > + if (ad->rx_use_avx512) { > #ifdef CC_AVX512_SUPPORT > if (rx_check_ret == > ICE_VECTOR_OFFLOAD_PATH) { > PMD_DRV_LOG(NOTICE, > @@ -3142,9 +3142,9 @@ ice_set_rx_function(struct rte_eth_dev *dev) > } else { > PMD_DRV_LOG(DEBUG, > "Using %sVector Rx (port %d).", > - use_avx2 ? "avx2 " : "", > + ad->rx_use_avx2 ? "avx2 " : "", > dev->data->port_id); > - dev->rx_pkt_burst = use_avx2 ? > + dev->rx_pkt_burst = ad->rx_use_avx2 ? > ice_recv_pkts_vec_avx2 : > ice_recv_pkts_vec; > } > @@ -3294,11 +3294,11 @@ ice_set_tx_function(struct rte_eth_dev *dev) > #ifdef RTE_ARCH_X86 > struct ice_tx_queue *txq; > int i; > - int tx_check_ret; > - bool use_avx512 = false; > - bool use_avx2 = false; > + int tx_check_ret = 0; > > if (rte_eal_process_type() == RTE_PROC_PRIMARY) { > + ad->tx_use_avx2 = false; > + ad->tx_use_avx512 = false; > tx_check_ret = ice_tx_vec_dev_check(dev); > if (tx_check_ret >= 0 && > rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) > { @@ -3308,18 +3308,18 @@ ice_set_tx_function(struct rte_eth_dev *dev) > rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == > 1 && > rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512BW) > == 1) #ifdef CC_AVX512_SUPPORT > - use_avx512 = true; > + ad->tx_use_avx512 = true; > #else > PMD_DRV_LOG(NOTICE, > "AVX512 is not supported in build env"); #endif > - if (!use_avx512 && tx_check_ret == ICE_VECTOR_PATH > && > + if (!ad->tx_use_avx512 && tx_check_ret == > ICE_VECTOR_PATH && > (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 > || > rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == > 1) && > rte_vect_get_max_simd_bitwidth() >= > RTE_VECT_SIMD_256) > - use_avx2 = true; > + ad->tx_use_avx2 = true; > > - if (!use_avx512 && tx_check_ret == > ICE_VECTOR_OFFLOAD_PATH) > + if (!ad->tx_use_avx512 && tx_check_ret == > ICE_VECTOR_OFFLOAD_PATH) > ad->tx_vec_allowed = false; > > if (ad->tx_vec_allowed) { > @@ -3337,7 +3337,7 @@ ice_set_tx_function(struct rte_eth_dev *dev) > } > > if (ad->tx_vec_allowed) { > - if (use_avx512) { > + if (ad->tx_use_avx512) { > #ifdef CC_AVX512_SUPPORT > if (tx_check_ret == ICE_VECTOR_OFFLOAD_PATH) { > PMD_DRV_LOG(NOTICE, > @@ -3354,9 +3354,9 @@ ice_set_tx_function(struct rte_eth_dev *dev) #endif > } else { > PMD_DRV_LOG(DEBUG, "Using %sVector Tx (port %d).", > - use_avx2 ? "avx2 " : "", > + ad->tx_use_avx2 ? "avx2 " : "", > dev->data->port_id); > - dev->tx_pkt_burst = use_avx2 ? > + dev->tx_pkt_burst = ad->tx_use_avx2 ? > ice_xmit_pkts_vec_avx2 : > ice_xmit_pkts_vec; > } > -- > 2.26.2
> -----Original Message----- > From: Wang, Yixue <yixue.wang@intel.com> > Sent: Thursday, June 3, 2021 6:04 PM > To: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming > <qiming.yang@intel.com> > Cc: Zhang, Liheng <liheng.zhang@intel.com>; Dong, Yao > <yao.dong@intel.com>; dev@dpdk.org; stable@dpdk.org > Subject: RE: [PATCH] net/ice: fix wrong data path selection in secondary > process > > Hi, Qi > > I've tested this patch and it works. > > Best Regards, > Yixue. > > > -----Original Message----- > > From: Zhang, Qi Z <qi.z.zhang@intel.com> > > Sent: Monday, May 24, 2021 17:08 > > To: Yang, Qiming <qiming.yang@intel.com> > > Cc: Zhang, Liheng <liheng.zhang@intel.com>; Wang, Yixue > > <yixue.wang@intel.com>; Dong, Yao <yao.dong@intel.com>; dev@dpdk.org; > > Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org > > Subject: [PATCH] net/ice: fix wrong data path selection in secondary > > process > > > > The flag use_avx2 and use_avx512 are defined as local variables, they > > will not be aware by the secondary process, then wrong data path is > > selected. Fix the issue by moving them into struct ice_adapter. > > > > Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") > > Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx") > > Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path") > > Cc: stable@dpdk.org > > > > Reported-by: Yixue Wang <yixue.wang@intel.com> > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> Tested-by: Yixue Wang <yixue.wang@intel.com> Applied to dpdk-next-net-intel. Thanks Qi
Hi, Is this tested on VFs? I saw crash on both PF as well as VF, on 20.11.1, but did not see PF crash on 20.11.3, I'm seeing a crash on the secondary process when it receives packet on the VF, but PF doesn't crash now on 20.11.3 So I suspect this is the patch which is fixing the issue on ICE secondary process crash on PF. Thanks & Regards, Navin Srinivas On Thu, Jun 3, 2021 at 3:51 PM Zhang, Qi Z <qi.z.zhang@intel.com> wrote: > > > > -----Original Message----- > > From: Wang, Yixue <yixue.wang@intel.com> > > Sent: Thursday, June 3, 2021 6:04 PM > > To: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming > > <qiming.yang@intel.com> > > Cc: Zhang, Liheng <liheng.zhang@intel.com>; Dong, Yao > > <yao.dong@intel.com>; dev@dpdk.org; stable@dpdk.org > > Subject: RE: [PATCH] net/ice: fix wrong data path selection in secondary > > process > > > > Hi, Qi > > > > I've tested this patch and it works. > > > > Best Regards, > > Yixue. > > > > > -----Original Message----- > > > From: Zhang, Qi Z <qi.z.zhang@intel.com> > > > Sent: Monday, May 24, 2021 17:08 > > > To: Yang, Qiming <qiming.yang@intel.com> > > > Cc: Zhang, Liheng <liheng.zhang@intel.com>; Wang, Yixue > > > <yixue.wang@intel.com>; Dong, Yao <yao.dong@intel.com>; dev@dpdk.org; > > > Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org > > > Subject: [PATCH] net/ice: fix wrong data path selection in secondary > > > process > > > > > > The flag use_avx2 and use_avx512 are defined as local variables, they > > > will not be aware by the secondary process, then wrong data path is > > > selected. Fix the issue by moving them into struct ice_adapter. > > > > > > Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") > > > Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx") > > > Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path") > > > Cc: stable@dpdk.org > > > > > > Reported-by: Yixue Wang <yixue.wang@intel.com> > > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> > > Tested-by: Yixue Wang <yixue.wang@intel.com> > > Applied to dpdk-next-net-intel. > > Thanks > Qi > >
Hi Srinivas: This is the fix for PF driver only, for VF we have a separated fix and it is not be captured in 20.11.3, but I saw the patches are already merged in stable tree. You can try with latest 20.11.4-rc1, or wait for 20.11.4 LTS. Regards Qi From: Navin Srinivas <g.navinsrinivas@gmail.com> Sent: Tuesday, February 22, 2022 11:56 AM To: Zhang, Qi Z <qi.z.zhang@intel.com> Cc: Wang, Yixue <yixue.wang@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Zhang, Liheng <liheng.zhang@intel.com>; Dong, Yao <yao.dong@intel.com>; dev@dpdk.org; stable@dpdk.org Subject: Re: [dpdk-dev] [PATCH] net/ice: fix wrong data path selection in secondary process Hi, Is this tested on VFs? I saw crash on both PF as well as VF, on 20.11.1, but did not see PF crash on 20.11.3, I'm seeing a crash on the secondary process when it receives packet on the VF, but PF doesn't crash now on 20.11.3 So I suspect this is the patch which is fixing the issue on ICE secondary process crash on PF. Thanks & Regards, Navin Srinivas On Thu, Jun 3, 2021 at 3:51 PM Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> wrote: > -----Original Message----- > From: Wang, Yixue <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> > Sent: Thursday, June 3, 2021 6:04 PM > To: Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>>; Yang, Qiming > <qiming.yang@intel.com<mailto:qiming.yang@intel.com>> > Cc: Zhang, Liheng <liheng.zhang@intel.com<mailto:liheng.zhang@intel.com>>; Dong, Yao > <yao.dong@intel.com<mailto:yao.dong@intel.com>>; dev@dpdk.org<mailto:dev@dpdk.org>; stable@dpdk.org<mailto:stable@dpdk.org> > Subject: RE: [PATCH] net/ice: fix wrong data path selection in secondary > process > > Hi, Qi > > I've tested this patch and it works. > > Best Regards, > Yixue. > > > -----Original Message----- > > From: Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> > > Sent: Monday, May 24, 2021 17:08 > > To: Yang, Qiming <qiming.yang@intel.com<mailto:qiming.yang@intel.com>> > > Cc: Zhang, Liheng <liheng.zhang@intel.com<mailto:liheng.zhang@intel.com>>; Wang, Yixue > > <yixue.wang@intel.com<mailto:yixue.wang@intel.com>>; Dong, Yao <yao.dong@intel.com<mailto:yao.dong@intel.com>>; dev@dpdk.org<mailto:dev@dpdk.org>; > > Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>>; stable@dpdk.org<mailto:stable@dpdk.org> > > Subject: [PATCH] net/ice: fix wrong data path selection in secondary > > process > > > > The flag use_avx2 and use_avx512 are defined as local variables, they > > will not be aware by the secondary process, then wrong data path is > > selected. Fix the issue by moving them into struct ice_adapter. > > > > Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") > > Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx") > > Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path") > > Cc: stable@dpdk.org<mailto:stable@dpdk.org> > > > > Reported-by: Yixue Wang <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> Tested-by: Yixue Wang <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> Applied to dpdk-next-net-intel. Thanks Qi
Hi Qi, Thank you for the confirmation! I will try with the mentioned release. Thanks & Regards, Navin Srinivas On Tue, Feb 22, 2022 at 10:01 AM Zhang, Qi Z <qi.z.zhang@intel.com> wrote: > Hi Srinivas: > > > > This is the fix for PF driver only, for VF we have a separated fix and it > is not be captured in 20.11.3, but I saw the patches are already merged in > stable tree. > > You can try with latest 20.11.4-rc1, or wait for 20.11.4 LTS. > > > > Regards > > Qi > > > > *From:* Navin Srinivas <g.navinsrinivas@gmail.com> > *Sent:* Tuesday, February 22, 2022 11:56 AM > *To:* Zhang, Qi Z <qi.z.zhang@intel.com> > *Cc:* Wang, Yixue <yixue.wang@intel.com>; Yang, Qiming < > qiming.yang@intel.com>; Zhang, Liheng <liheng.zhang@intel.com>; Dong, Yao > <yao.dong@intel.com>; dev@dpdk.org; stable@dpdk.org > *Subject:* Re: [dpdk-dev] [PATCH] net/ice: fix wrong data path selection > in secondary process > > > > Hi, > > > > Is this tested on VFs? I saw crash on both PF as well as VF, on 20.11.1, > but did not see PF crash on 20.11.3, > > I'm seeing a crash on the secondary process when it receives packet on the > VF, but PF doesn't crash now on 20.11.3 > > > > So I suspect this is the patch which is fixing the issue on ICE secondary > process crash on PF. > > > > Thanks & Regards, > > Navin Srinivas > > > > On Thu, Jun 3, 2021 at 3:51 PM Zhang, Qi Z <qi.z.zhang@intel.com> wrote: > > > > > -----Original Message----- > > From: Wang, Yixue <yixue.wang@intel.com> > > Sent: Thursday, June 3, 2021 6:04 PM > > To: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming > > <qiming.yang@intel.com> > > Cc: Zhang, Liheng <liheng.zhang@intel.com>; Dong, Yao > > <yao.dong@intel.com>; dev@dpdk.org; stable@dpdk.org > > Subject: RE: [PATCH] net/ice: fix wrong data path selection in secondary > > process > > > > Hi, Qi > > > > I've tested this patch and it works. > > > > Best Regards, > > Yixue. > > > > > -----Original Message----- > > > From: Zhang, Qi Z <qi.z.zhang@intel.com> > > > Sent: Monday, May 24, 2021 17:08 > > > To: Yang, Qiming <qiming.yang@intel.com> > > > Cc: Zhang, Liheng <liheng.zhang@intel.com>; Wang, Yixue > > > <yixue.wang@intel.com>; Dong, Yao <yao.dong@intel.com>; dev@dpdk.org; > > > Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org > > > Subject: [PATCH] net/ice: fix wrong data path selection in secondary > > > process > > > > > > The flag use_avx2 and use_avx512 are defined as local variables, they > > > will not be aware by the secondary process, then wrong data path is > > > selected. Fix the issue by moving them into struct ice_adapter. > > > > > > Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") > > > Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx") > > > Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path") > > > Cc: stable@dpdk.org > > > > > > Reported-by: Yixue Wang <yixue.wang@intel.com> > > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> > > Tested-by: Yixue Wang <yixue.wang@intel.com> > > Applied to dpdk-next-net-intel. > > Thanks > Qi > >
On 22/02/2022 04:30, Zhang, Qi Z wrote: > Hi Srinivas: > > This is the fix for PF driver only, for VF we have a separated fix and it is not be captured in 20.11.3, but I saw the patches are already merged in stable tree. > You can try with latest 20.11.4-rc1, or wait for 20.11.4 LTS. > 20.11.4 is already released. Xueming sent details here http://inbox.dpdk.org/announce/20220124084950.482883-1-xuemingl@nvidia.com/T/#u You can check the release notes (or git) for specific fixes https://git.dpdk.org/dpdk-stable/tree/doc/guides/rel_notes/release_20_11.rst?h=20.11 > Regards > Qi > > From: Navin Srinivas <g.navinsrinivas@gmail.com> > Sent: Tuesday, February 22, 2022 11:56 AM > To: Zhang, Qi Z <qi.z.zhang@intel.com> > Cc: Wang, Yixue <yixue.wang@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Zhang, Liheng <liheng.zhang@intel.com>; Dong, Yao <yao.dong@intel.com>; dev@dpdk.org; stable@dpdk.org > Subject: Re: [dpdk-dev] [PATCH] net/ice: fix wrong data path selection in secondary process > > Hi, > > Is this tested on VFs? I saw crash on both PF as well as VF, on 20.11.1, but did not see PF crash on 20.11.3, > I'm seeing a crash on the secondary process when it receives packet on the VF, but PF doesn't crash now on 20.11.3 > > So I suspect this is the patch which is fixing the issue on ICE secondary process crash on PF. > > Thanks & Regards, > Navin Srinivas > > On Thu, Jun 3, 2021 at 3:51 PM Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> wrote: > > >> -----Original Message----- >> From: Wang, Yixue <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> >> Sent: Thursday, June 3, 2021 6:04 PM >> To: Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>>; Yang, Qiming >> <qiming.yang@intel.com<mailto:qiming.yang@intel.com>> >> Cc: Zhang, Liheng <liheng.zhang@intel.com<mailto:liheng.zhang@intel.com>>; Dong, Yao >> <yao.dong@intel.com<mailto:yao.dong@intel.com>>; dev@dpdk.org<mailto:dev@dpdk.org>; stable@dpdk.org<mailto:stable@dpdk.org> >> Subject: RE: [PATCH] net/ice: fix wrong data path selection in secondary >> process >> >> Hi, Qi >> >> I've tested this patch and it works. >> >> Best Regards, >> Yixue. >> >>> -----Original Message----- >>> From: Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> >>> Sent: Monday, May 24, 2021 17:08 >>> To: Yang, Qiming <qiming.yang@intel.com<mailto:qiming.yang@intel.com>> >>> Cc: Zhang, Liheng <liheng.zhang@intel.com<mailto:liheng.zhang@intel.com>>; Wang, Yixue >>> <yixue.wang@intel.com<mailto:yixue.wang@intel.com>>; Dong, Yao <yao.dong@intel.com<mailto:yao.dong@intel.com>>; dev@dpdk.org<mailto:dev@dpdk.org>; >>> Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>>; stable@dpdk.org<mailto:stable@dpdk.org> >>> Subject: [PATCH] net/ice: fix wrong data path selection in secondary >>> process >>> >>> The flag use_avx2 and use_avx512 are defined as local variables, they >>> will not be aware by the secondary process, then wrong data path is >>> selected. Fix the issue by moving them into struct ice_adapter. >>> >>> Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") >>> Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx") >>> Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path") >>> Cc: stable@dpdk.org<mailto:stable@dpdk.org> >>> >>> Reported-by: Yixue Wang <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> >>> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> > > Tested-by: Yixue Wang <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> > > Applied to dpdk-next-net-intel. > > Thanks > Qi
are those patch available/merged in dpdk 21.11? Dong yao (from my iPhone) > 在 2022年2月22日，下午5:26，Kevin Traynor <ktraynor@redhat.com> 写道： > > On 22/02/2022 04:30, Zhang, Qi Z wrote: >> Hi Srinivas: >> This is the fix for PF driver only, for VF we have a separated fix and it is not be captured in 20.11.3, but I saw the patches are already merged in stable tree. >> You can try with latest 20.11.4-rc1, or wait for 20.11.4 LTS. > > 20.11.4 is already released. Xueming sent details here > http://inbox.dpdk.org/announce/20220124084950.482883-1-xuemingl@nvidia.com/T/#u > > You can check the release notes (or git) for specific fixes > https://git.dpdk.org/dpdk-stable/tree/doc/guides/rel_notes/release_20_11.rst?h=20.11 > >> Regards >> Qi >> From: Navin Srinivas <g.navinsrinivas@gmail.com> >> Sent: Tuesday, February 22, 2022 11:56 AM >> To: Zhang, Qi Z <qi.z.zhang@intel.com> >> Cc: Wang, Yixue <yixue.wang@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Zhang, Liheng <liheng.zhang@intel.com>; Dong, Yao <yao.dong@intel.com>; dev@dpdk.org; stable@dpdk.org >> Subject: Re: [dpdk-dev] [PATCH] net/ice: fix wrong data path selection in secondary process >> Hi, >> Is this tested on VFs? I saw crash on both PF as well as VF, on 20.11.1, but did not see PF crash on 20.11.3, >> I'm seeing a crash on the secondary process when it receives packet on the VF, but PF doesn't crash now on 20.11.3 >> So I suspect this is the patch which is fixing the issue on ICE secondary process crash on PF. >> Thanks & Regards, >> Navin Srinivas >>> On Thu, Jun 3, 2021 at 3:51 PM Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> wrote: >>> -----Original Message----- >>> From: Wang, Yixue <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> >>> Sent: Thursday, June 3, 2021 6:04 PM >>> To: Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>>; Yang, Qiming >>> <qiming.yang@intel.com<mailto:qiming.yang@intel.com>> >>> Cc: Zhang, Liheng <liheng.zhang@intel.com<mailto:liheng.zhang@intel.com>>; Dong, Yao >>> <yao.dong@intel.com<mailto:yao.dong@intel.com>>; dev@dpdk.org<mailto:dev@dpdk.org>; stable@dpdk.org<mailto:stable@dpdk.org> >>> Subject: RE: [PATCH] net/ice: fix wrong data path selection in secondary >>> process >>> >>> Hi, Qi >>> >>> I've tested this patch and it works. >>> >>> Best Regards, >>> Yixue. >>> >>>> -----Original Message----- >>>> From: Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> >>>> Sent: Monday, May 24, 2021 17:08 >>>> To: Yang, Qiming <qiming.yang@intel.com<mailto:qiming.yang@intel.com>> >>>> Cc: Zhang, Liheng <liheng.zhang@intel.com<mailto:liheng.zhang@intel.com>>; Wang, Yixue >>>> <yixue.wang@intel.com<mailto:yixue.wang@intel.com>>; Dong, Yao <yao.dong@intel.com<mailto:yao.dong@intel.com>>; dev@dpdk.org<mailto:dev@dpdk.org>; >>>> Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>>; stable@dpdk.org<mailto:stable@dpdk.org> >>>> Subject: [PATCH] net/ice: fix wrong data path selection in secondary >>>> process >>>> >>>> The flag use_avx2 and use_avx512 are defined as local variables, they >>>> will not be aware by the secondary process, then wrong data path is >>>> selected. Fix the issue by moving them into struct ice_adapter. >>>> >>>> Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") >>>> Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx") >>>> Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path") >>>> Cc: stable@dpdk.org<mailto:stable@dpdk.org> >>>> >>>> Reported-by: Yixue Wang <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> >>>> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> >> Tested-by: Yixue Wang <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> >> Applied to dpdk-next-net-intel. >> Thanks >> Qi >
They are both included in DPDK21.11 according to my alignment with Qi and Dapeng. > -----Original Message----- > From: Dong, Yao <yao.dong@intel.com> > Sent: Tuesday, February 22, 2022 8:07 PM > To: Kevin Traynor <ktraynor@redhat.com> > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Navin Srinivas > <g.navinsrinivas@gmail.com>; Wang, Yixue <yixue.wang@intel.com>; Yang, > Qiming <qiming.yang@intel.com>; Zhang, Liheng <liheng.zhang@intel.com>; > dev@dpdk.org; stable@dpdk.org; Xueming(Steven) Li <xuemingl@nvidia.com> > Subject: Re: [dpdk-dev] [PATCH] net/ice: fix wrong data path selection in > secondary process > > are those patch available/merged in dpdk 21.11? > > Dong yao (from my iPhone) > > > 在 2022年2月22日，下午5:26，Kevin Traynor <ktraynor@redhat.com> 写 > 道： > > > > On 22/02/2022 04:30, Zhang, Qi Z wrote: > >> Hi Srinivas: > >> This is the fix for PF driver only, for VF we have a separated fix and it is not be > captured in 20.11.3, but I saw the patches are already merged in stable tree. > >> You can try with latest 20.11.4-rc1, or wait for 20.11.4 LTS. > > > > 20.11.4 is already released. Xueming sent details here > > http://inbox.dpdk.org/announce/20220124084950.482883-1- > xuemingl@nvidia > > .com/T/#u > > > > You can check the release notes (or git) for specific fixes > > https://git.dpdk.org/dpdk-stable/tree/doc/guides/rel_notes/release_20_ > > 11.rst?h=20.11 > > > >> Regards > >> Qi > >> From: Navin Srinivas <g.navinsrinivas@gmail.com> > >> Sent: Tuesday, February 22, 2022 11:56 AM > >> To: Zhang, Qi Z <qi.z.zhang@intel.com> > >> Cc: Wang, Yixue <yixue.wang@intel.com>; Yang, Qiming > >> <qiming.yang@intel.com>; Zhang, Liheng <liheng.zhang@intel.com>; > >> Dong, Yao <yao.dong@intel.com>; dev@dpdk.org; stable@dpdk.org > >> Subject: Re: [dpdk-dev] [PATCH] net/ice: fix wrong data path > >> selection in secondary process Hi, Is this tested on VFs? I saw crash > >> on both PF as well as VF, on 20.11.1, but did not see PF crash on > >> 20.11.3, I'm seeing a crash on the secondary process when it receives > >> packet on the VF, but PF doesn't crash now on 20.11.3 So I suspect this is the > patch which is fixing the issue on ICE secondary process crash on PF. > >> Thanks & Regards, > >> Navin Srinivas > >>> On Thu, Jun 3, 2021 at 3:51 PM Zhang, Qi Z > <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> wrote: > >>> -----Original Message----- > >>> From: Wang, Yixue > >>> <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> > >>> Sent: Thursday, June 3, 2021 6:04 PM > >>> To: Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>>; > >>> Yang, Qiming <qiming.yang@intel.com<mailto:qiming.yang@intel.com>> > >>> Cc: Zhang, Liheng > >>> <liheng.zhang@intel.com<mailto:liheng.zhang@intel.com>>; Dong, Yao > >>> <yao.dong@intel.com<mailto:yao.dong@intel.com>>; > >>> dev@dpdk.org<mailto:dev@dpdk.org>; > >>> stable@dpdk.org<mailto:stable@dpdk.org> > >>> Subject: RE: [PATCH] net/ice: fix wrong data path selection in > >>> secondary process > >>> > >>> Hi, Qi > >>> > >>> I've tested this patch and it works. > >>> > >>> Best Regards, > >>> Yixue. > >>> > >>>> -----Original Message----- > >>>> From: Zhang, Qi Z > >>>> <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> > >>>> Sent: Monday, May 24, 2021 17:08 > >>>> To: Yang, Qiming > >>>> <qiming.yang@intel.com<mailto:qiming.yang@intel.com>> > >>>> Cc: Zhang, Liheng > >>>> <liheng.zhang@intel.com<mailto:liheng.zhang@intel.com>>; Wang, > >>>> Yixue <yixue.wang@intel.com<mailto:yixue.wang@intel.com>>; Dong, > >>>> Yao <yao.dong@intel.com<mailto:yao.dong@intel.com>>; > >>>> dev@dpdk.org<mailto:dev@dpdk.org>; > >>>> Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>>; > >>>> stable@dpdk.org<mailto:stable@dpdk.org> > >>>> Subject: [PATCH] net/ice: fix wrong data path selection in > >>>> secondary process > >>>> > >>>> The flag use_avx2 and use_avx512 are defined as local variables, > >>>> they will not be aware by the secondary process, then wrong data > >>>> path is selected. Fix the issue by moving them into struct ice_adapter. > >>>> > >>>> Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") > >>>> Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx") > >>>> Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path") > >>>> Cc: stable@dpdk.org<mailto:stable@dpdk.org> > >>>> > >>>> Reported-by: Yixue Wang > >>>> <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> > >>>> Signed-off-by: Qi Zhang > >>>> <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> > >> Tested-by: Yixue Wang > >> <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> > >> Applied to dpdk-next-net-intel. > >> Thanks > >> Qi > >
Thanks, I noticed it in the release and took the LTS version. I do not see the previously noticed VF crash now on 20.11.4 Navin On Tue, Feb 22, 2022 at 2:51 PM Kevin Traynor <ktraynor@redhat.com> wrote: > On 22/02/2022 04:30, Zhang, Qi Z wrote: > > Hi Srinivas: > > > > This is the fix for PF driver only, for VF we have a separated fix and > it is not be captured in 20.11.3, but I saw the patches are already merged > in stable tree. > > You can try with latest 20.11.4-rc1, or wait for 20.11.4 LTS. > > > > 20.11.4 is already released. Xueming sent details here > > http://inbox.dpdk.org/announce/20220124084950.482883-1-xuemingl@nvidia.com/T/#u > > You can check the release notes (or git) for specific fixes > > https://git.dpdk.org/dpdk-stable/tree/doc/guides/rel_notes/release_20_11.rst?h=20.11 > > > Regards > > Qi > > > > From: Navin Srinivas <g.navinsrinivas@gmail.com> > > Sent: Tuesday, February 22, 2022 11:56 AM > > To: Zhang, Qi Z <qi.z.zhang@intel.com> > > Cc: Wang, Yixue <yixue.wang@intel.com>; Yang, Qiming < > qiming.yang@intel.com>; Zhang, Liheng <liheng.zhang@intel.com>; Dong, Yao > <yao.dong@intel.com>; dev@dpdk.org; stable@dpdk.org > > Subject: Re: [dpdk-dev] [PATCH] net/ice: fix wrong data path selection > in secondary process > > > > Hi, > > > > Is this tested on VFs? I saw crash on both PF as well as VF, on 20.11.1, > but did not see PF crash on 20.11.3, > > I'm seeing a crash on the secondary process when it receives packet on > the VF, but PF doesn't crash now on 20.11.3 > > > > So I suspect this is the patch which is fixing the issue on ICE > secondary process crash on PF. > > > > Thanks & Regards, > > Navin Srinivas > > > > On Thu, Jun 3, 2021 at 3:51 PM Zhang, Qi Z <qi.z.zhang@intel.com<mailto: > qi.z.zhang@intel.com>> wrote: > > > > > >> -----Original Message----- > >> From: Wang, Yixue <yixue.wang@intel.com<mailto:yixue.wang@intel.com>> > >> Sent: Thursday, June 3, 2021 6:04 PM > >> To: Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>>; > Yang, Qiming > >> <qiming.yang@intel.com<mailto:qiming.yang@intel.com>> > >> Cc: Zhang, Liheng <liheng.zhang@intel.com<mailto:liheng.zhang@intel.com>>; > Dong, Yao > >> <yao.dong@intel.com<mailto:yao.dong@intel.com>>; dev@dpdk.org<mailto: > dev@dpdk.org>; stable@dpdk.org<mailto:stable@dpdk.org> > >> Subject: RE: [PATCH] net/ice: fix wrong data path selection in secondary > >> process > >> > >> Hi, Qi > >> > >> I've tested this patch and it works. > >> > >> Best Regards, > >> Yixue. > >> > >>> -----Original Message----- > >>> From: Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>> > >>> Sent: Monday, May 24, 2021 17:08 > >>> To: Yang, Qiming <qiming.yang@intel.com<mailto:qiming.yang@intel.com>> > >>> Cc: Zhang, Liheng <liheng.zhang@intel.com<mailto: > liheng.zhang@intel.com>>; Wang, Yixue > >>> <yixue.wang@intel.com<mailto:yixue.wang@intel.com>>; Dong, Yao < > yao.dong@intel.com<mailto:yao.dong@intel.com>>; dev@dpdk.org<mailto: > dev@dpdk.org>; > >>> Zhang, Qi Z <qi.z.zhang@intel.com<mailto:qi.z.zhang@intel.com>>; > stable@dpdk.org<mailto:stable@dpdk.org> > >>> Subject: [PATCH] net/ice: fix wrong data path selection in secondary > >>> process > >>> > >>> The flag use_avx2 and use_avx512 are defined as local variables, they > >>> will not be aware by the secondary process, then wrong data path is > >>> selected. Fix the issue by moving them into struct ice_adapter. > >>> > >>> Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") > >>> Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx") > >>> Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path") > >>> Cc: stable@dpdk.org<mailto:stable@dpdk.org> > >>> > >>> Reported-by: Yixue Wang <yixue.wang@intel.com<mailto: > yixue.wang@intel.com>> > >>> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com<mailto: > qi.z.zhang@intel.com>> > > > > Tested-by: Yixue Wang <yixue.wang@intel.com<mailto:yixue.wang@intel.com > >> > > > > Applied to dpdk-next-net-intel. > > > > Thanks > > Qi > >
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index 2a8a8169d5..aebfd1b0b7 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -487,6 +487,12 @@ struct ice_adapter { struct ice_devargs devargs; enum ice_pkg_type active_pkg_type; /* loaded ddp package type */ uint16_t fdir_ref_cnt; +#ifdef RTE_ARCH_X86 + bool rx_use_avx2; + bool rx_use_avx512; + bool tx_use_avx2; + bool tx_use_avx512; +#endif }; struct ice_vsi_vlan_pvid_info { diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 49abcb2f5c..f4f6f48d78 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3058,11 +3058,11 @@ ice_set_rx_function(struct rte_eth_dev *dev) #ifdef RTE_ARCH_X86 struct ice_rx_queue *rxq; int i; - int rx_check_ret; - bool use_avx512 = false; - bool use_avx2 = false; + int rx_check_ret = 0; 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); if (rx_check_ret >= 0 && ad->rx_bulk_alloc_allowed && rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) { @@ -3079,16 +3079,16 @@ ice_set_rx_function(struct rte_eth_dev *dev) rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 && rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512BW) == 1) #ifdef CC_AVX512_SUPPORT - use_avx512 = true; + ad->rx_use_avx512 = true; #else PMD_DRV_LOG(NOTICE, "AVX512 is not supported in build env"); #endif - if (!use_avx512 && + if (!ad->rx_use_avx512 && (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 || rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1) && rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256) - use_avx2 = true; + ad->rx_use_avx2 = true; } else { ad->rx_vec_allowed = false; @@ -3097,7 +3097,7 @@ ice_set_rx_function(struct rte_eth_dev *dev) if (ad->rx_vec_allowed) { if (dev->data->scattered_rx) { - if (use_avx512) { + if (ad->rx_use_avx512) { #ifdef CC_AVX512_SUPPORT if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) { PMD_DRV_LOG(NOTICE, @@ -3116,14 +3116,14 @@ ice_set_rx_function(struct rte_eth_dev *dev) } else { PMD_DRV_LOG(DEBUG, "Using %sVector Scattered Rx (port %d).", - use_avx2 ? "avx2 " : "", + ad->rx_use_avx2 ? "avx2 " : "", dev->data->port_id); - dev->rx_pkt_burst = use_avx2 ? + dev->rx_pkt_burst = ad->rx_use_avx2 ? ice_recv_scattered_pkts_vec_avx2 : ice_recv_scattered_pkts_vec; } } else { - if (use_avx512) { + if (ad->rx_use_avx512) { #ifdef CC_AVX512_SUPPORT if (rx_check_ret == ICE_VECTOR_OFFLOAD_PATH) { PMD_DRV_LOG(NOTICE, @@ -3142,9 +3142,9 @@ ice_set_rx_function(struct rte_eth_dev *dev) } else { PMD_DRV_LOG(DEBUG, "Using %sVector Rx (port %d).", - use_avx2 ? "avx2 " : "", + ad->rx_use_avx2 ? "avx2 " : "", dev->data->port_id); - dev->rx_pkt_burst = use_avx2 ? + dev->rx_pkt_burst = ad->rx_use_avx2 ? ice_recv_pkts_vec_avx2 : ice_recv_pkts_vec; } @@ -3294,11 +3294,11 @@ ice_set_tx_function(struct rte_eth_dev *dev) #ifdef RTE_ARCH_X86 struct ice_tx_queue *txq; int i; - int tx_check_ret; - bool use_avx512 = false; - bool use_avx2 = false; + int tx_check_ret = 0; if (rte_eal_process_type() == RTE_PROC_PRIMARY) { + ad->tx_use_avx2 = false; + ad->tx_use_avx512 = false; tx_check_ret = ice_tx_vec_dev_check(dev); if (tx_check_ret >= 0 && rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) { @@ -3308,18 +3308,18 @@ ice_set_tx_function(struct rte_eth_dev *dev) rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 && rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512BW) == 1) #ifdef CC_AVX512_SUPPORT - use_avx512 = true; + ad->tx_use_avx512 = true; #else PMD_DRV_LOG(NOTICE, "AVX512 is not supported in build env"); #endif - if (!use_avx512 && tx_check_ret == ICE_VECTOR_PATH && + if (!ad->tx_use_avx512 && tx_check_ret == ICE_VECTOR_PATH && (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 || rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1) && rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256) - use_avx2 = true; + ad->tx_use_avx2 = true; - if (!use_avx512 && tx_check_ret == ICE_VECTOR_OFFLOAD_PATH) + if (!ad->tx_use_avx512 && tx_check_ret == ICE_VECTOR_OFFLOAD_PATH) ad->tx_vec_allowed = false; if (ad->tx_vec_allowed) { @@ -3337,7 +3337,7 @@ ice_set_tx_function(struct rte_eth_dev *dev) } if (ad->tx_vec_allowed) { - if (use_avx512) { + if (ad->tx_use_avx512) { #ifdef CC_AVX512_SUPPORT if (tx_check_ret == ICE_VECTOR_OFFLOAD_PATH) { PMD_DRV_LOG(NOTICE, @@ -3354,9 +3354,9 @@ ice_set_tx_function(struct rte_eth_dev *dev) #endif } else { PMD_DRV_LOG(DEBUG, "Using %sVector Tx (port %d).", - use_avx2 ? "avx2 " : "", + ad->tx_use_avx2 ? "avx2 " : "", dev->data->port_id); - dev->tx_pkt_burst = use_avx2 ? + dev->tx_pkt_burst = ad->tx_use_avx2 ? ice_xmit_pkts_vec_avx2 : ice_xmit_pkts_vec; }
The flag use_avx2 and use_avx512 are defined as local variables, they will not be aware by the secondary process, then wrong data path is selected. Fix the issue by moving them into struct ice_adapter. Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx") Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path") Cc: stable@dpdk.org Reported-by: Yixue Wang <yixue.wang@intel.com> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> --- drivers/net/ice/ice_ethdev.h | 6 +++++ drivers/net/ice/ice_rxtx.c | 44 ++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 22 deletions(-)