diff mbox series

[v3] net/cpfl: fix datapath function configuration

Message ID 20230926060455.18614-1-wenjun1.wu@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v3] net/cpfl: fix datapath function configuration |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/github-robot: build success github build: passed
ci/intel-Functional success Functional PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-compile-amd64-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/iol-unit-amd64-testing success Testing PASS
ci/iol-unit-arm64-testing success Testing PASS
ci/iol-sample-apps-testing success Testing PASS

Commit Message

Wenjun Wu Sept. 26, 2023, 6:04 a.m. UTC 
  Vector datapath does not support any advanced features for now, so disable
vector path if TX checksum offload or RX scatter is enabled.

Fixes: 2f39845891e6 ("net/cpfl: add AVX512 data path for single queue model")

Signed-off-by: Wenjun Wu <wenjun1.wu@intel.com>

---
v3: fix log typo.
v2: disable vector path for scatter cases.
---
 drivers/net/cpfl/cpfl_rxtx_vec_common.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Xing, Beilei Sept. 26, 2023, 6 a.m. UTC | #1 
> -----Original Message-----
> From: Wu, Wenjun1 <wenjun1.wu@intel.com>
> Sent: Tuesday, September 26, 2023 2:05 PM
> To: dev@dpdk.org; Zhang, Yuying <yuying.zhang@intel.com>; Xing, Beilei
> <beilei.xing@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: Wu, Wenjun1 <wenjun1.wu@intel.com>
> Subject: [PATCH v3] net/cpfl: fix datapath function configuration
> 
> Vector datapath does not support any advanced features for now, so disable
> vector path if TX checksum offload or RX scatter is enabled.
> 
> Fixes: 2f39845891e6 ("net/cpfl: add AVX512 data path for single queue
> model")
> 
> Signed-off-by: Wenjun Wu <wenjun1.wu@intel.com>
> 
> ---
> v3: fix log typo.
> v2: disable vector path for scatter cases.
> ---
>  drivers/net/cpfl/cpfl_rxtx_vec_common.h | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/cpfl/cpfl_rxtx_vec_common.h
> b/drivers/net/cpfl/cpfl_rxtx_vec_common.h
> index d8e9191196..479e1ddcb9 100644
> --- a/drivers/net/cpfl/cpfl_rxtx_vec_common.h
> +++ b/drivers/net/cpfl/cpfl_rxtx_vec_common.h
> @@ -25,7 +25,11 @@
>  		RTE_ETH_RX_OFFLOAD_TIMESTAMP)
>  #define CPFL_TX_NO_VECTOR_FLAGS (		\
>  		RTE_ETH_TX_OFFLOAD_TCP_TSO |	\
> -		RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
> +		RTE_ETH_TX_OFFLOAD_MULTI_SEGS |	\
> +		RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |		\
> +		RTE_ETH_TX_OFFLOAD_SCTP_CKSUM |		\
> +		RTE_ETH_TX_OFFLOAD_UDP_CKSUM |	\
> +		RTE_ETH_TX_OFFLOAD_TCP_CKSUM)
> 
>  static inline int
>  cpfl_rx_vec_queue_default(struct idpf_rx_queue *rxq) @@ -81,6 +85,9 @@
> cpfl_rx_vec_dev_check_default(struct rte_eth_dev *dev)
>  	struct cpfl_rx_queue *cpfl_rxq;
>  	int i, default_ret, splitq_ret, ret = CPFL_SCALAR_PATH;
> 
> +	if (dev->data->scattered_rx)
> +		return CPFL_SCALAR_PATH;
> +
>  	for (i = 0; i < dev->data->nb_rx_queues; i++) {
>  		cpfl_rxq = dev->data->rx_queues[i];
>  		default_ret = cpfl_rx_vec_queue_default(&cpfl_rxq->base);
> --
> 2.34.1

Acked-by: Beilei Xing <beilei.xing@intel.com>
Qi Zhang Sept. 26, 2023, 6:04 a.m. UTC | #2 
> -----Original Message-----
> From: Xing, Beilei <beilei.xing@intel.com>
> Sent: Tuesday, September 26, 2023 2:00 PM
> To: Wu, Wenjun1 <wenjun1.wu@intel.com>; dev@dpdk.org; Zhang, Yuying
> <yuying.zhang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> Subject: RE: [PATCH v3] net/cpfl: fix datapath function configuration
> 
> 
> 
> > -----Original Message-----
> > From: Wu, Wenjun1 <wenjun1.wu@intel.com>
> > Sent: Tuesday, September 26, 2023 2:05 PM
> > To: dev@dpdk.org; Zhang, Yuying <yuying.zhang@intel.com>; Xing, Beilei
> > <beilei.xing@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> > Cc: Wu, Wenjun1 <wenjun1.wu@intel.com>
> > Subject: [PATCH v3] net/cpfl: fix datapath function configuration
> >
> > Vector datapath does not support any advanced features for now, so
> > disable vector path if TX checksum offload or RX scatter is enabled.
> >
> > Fixes: 2f39845891e6 ("net/cpfl: add AVX512 data path for single queue
> > model")
> >
> > Signed-off-by: Wenjun Wu <wenjun1.wu@intel.com>
> >
> > ---
> > v3: fix log typo.
> > v2: disable vector path for scatter cases.
> > ---
> >  drivers/net/cpfl/cpfl_rxtx_vec_common.h | 9 ++++++++-
> >  1 file changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/cpfl/cpfl_rxtx_vec_common.h
> > b/drivers/net/cpfl/cpfl_rxtx_vec_common.h
> > index d8e9191196..479e1ddcb9 100644
> > --- a/drivers/net/cpfl/cpfl_rxtx_vec_common.h
> > +++ b/drivers/net/cpfl/cpfl_rxtx_vec_common.h
> > @@ -25,7 +25,11 @@
> >  		RTE_ETH_RX_OFFLOAD_TIMESTAMP)
> >  #define CPFL_TX_NO_VECTOR_FLAGS (		\
> >  		RTE_ETH_TX_OFFLOAD_TCP_TSO |	\
> > -		RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
> > +		RTE_ETH_TX_OFFLOAD_MULTI_SEGS |	\
> > +		RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |		\
> > +		RTE_ETH_TX_OFFLOAD_SCTP_CKSUM |		\
> > +		RTE_ETH_TX_OFFLOAD_UDP_CKSUM |	\
> > +		RTE_ETH_TX_OFFLOAD_TCP_CKSUM)
> >
> >  static inline int
> >  cpfl_rx_vec_queue_default(struct idpf_rx_queue *rxq) @@ -81,6 +85,9
> > @@ cpfl_rx_vec_dev_check_default(struct rte_eth_dev *dev)
> >  	struct cpfl_rx_queue *cpfl_rxq;
> >  	int i, default_ret, splitq_ret, ret = CPFL_SCALAR_PATH;
> >
> > +	if (dev->data->scattered_rx)
> > +		return CPFL_SCALAR_PATH;
> > +
> >  	for (i = 0; i < dev->data->nb_rx_queues; i++) {
> >  		cpfl_rxq = dev->data->rx_queues[i];
> >  		default_ret = cpfl_rx_vec_queue_default(&cpfl_rxq->base);
> > --
> > 2.34.1
> 
> Acked-by: Beilei Xing <beilei.xing@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
diff mbox series

Patch

diff --git a/drivers/net/cpfl/cpfl_rxtx_vec_common.h b/drivers/net/cpfl/cpfl_rxtx_vec_common.h
index d8e9191196..479e1ddcb9 100644
--- a/drivers/net/cpfl/cpfl_rxtx_vec_common.h
+++ b/drivers/net/cpfl/cpfl_rxtx_vec_common.h
@@ -25,7 +25,11 @@ 
 		RTE_ETH_RX_OFFLOAD_TIMESTAMP)
 #define CPFL_TX_NO_VECTOR_FLAGS (		\
 		RTE_ETH_TX_OFFLOAD_TCP_TSO |	\
-		RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
+		RTE_ETH_TX_OFFLOAD_MULTI_SEGS |	\
+		RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |		\
+		RTE_ETH_TX_OFFLOAD_SCTP_CKSUM |		\
+		RTE_ETH_TX_OFFLOAD_UDP_CKSUM |	\
+		RTE_ETH_TX_OFFLOAD_TCP_CKSUM)
 
 static inline int
 cpfl_rx_vec_queue_default(struct idpf_rx_queue *rxq)
@@ -81,6 +85,9 @@  cpfl_rx_vec_dev_check_default(struct rte_eth_dev *dev)
 	struct cpfl_rx_queue *cpfl_rxq;
 	int i, default_ret, splitq_ret, ret = CPFL_SCALAR_PATH;
 
+	if (dev->data->scattered_rx)
+		return CPFL_SCALAR_PATH;
+
 	for (i = 0; i < dev->data->nb_rx_queues; i++) {
 		cpfl_rxq = dev->data->rx_queues[i];
 		default_ret = cpfl_rx_vec_queue_default(&cpfl_rxq->base);