For Tx packets, if no other offload flag except 'PKT_TX_OUTER_IPV6, PKT_TX_OUTER_IPV4, PKT_TX_IPV6, PKT_TX_IPV4' is set, the hardware doesn't need to do offloads for these packets. This patch removes those previously indicated flags from the offload flag checking in simple Tx datapath. Fixes: 146ffa81d05e ("net/i40e: add Tx preparation for simple Tx datapath") Cc: stable@dpdk.org Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com> --- drivers/net/i40e/i40e_rxtx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 86a9eae..48d0582 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -1501,7 +1501,9 @@ return i; } - if (ol_flags & PKT_TX_OFFLOAD_MASK) { + if (ol_flags & PKT_TX_OFFLOAD_MASK & + ~(PKT_TX_OUTER_IPV6 | PKT_TX_OUTER_IPV4 | + PKT_TX_IPV6 | PKT_TX_IPV4)) { rte_errno = ENOTSUP; return i; } -- 1.8.3.1
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Alvin Zhang
> Sent: Tuesday, April 27, 2021 4:59 PM
> To: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Zhang, AlvinX <alvinx.zhang@intel.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/i40e: fix offload flag checking in simple Tx datapath
Tested-by: Jun, Zhou <junx.w.zhou@intel.com>
> -----Original Message----- > From: dev <dev-bounces@dpdk.org> On Behalf Of Alvin Zhang > Sent: Tuesday, April 27, 2021 4:59 PM > To: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com> > Cc: dev@dpdk.org; Zhang, AlvinX <alvinx.zhang@intel.com>; stable@dpdk.org > Subject: [dpdk-dev] [PATCH] net/i40e: fix offload flag checking in simple Tx > datapath > > For Tx packets, if no other offload flag except 'PKT_TX_OUTER_IPV6, > PKT_TX_OUTER_IPV4, PKT_TX_IPV6, PKT_TX_IPV4' is set, the hardware doesn't > need to do offloads for these packets. > > This patch removes those previously indicated flags from the offload flag > checking in simple Tx datapath. > > Fixes: 146ffa81d05e ("net/i40e: add Tx preparation for simple Tx datapath") > Cc: stable@dpdk.org > > Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com> > --- > drivers/net/i40e/i40e_rxtx.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index > 86a9eae..48d0582 100644 > --- a/drivers/net/i40e/i40e_rxtx.c > +++ b/drivers/net/i40e/i40e_rxtx.c > @@ -1501,7 +1501,9 @@ > return i; > } > > - if (ol_flags & PKT_TX_OFFLOAD_MASK) { > + if (ol_flags & PKT_TX_OFFLOAD_MASK & > + ~(PKT_TX_OUTER_IPV6 | PKT_TX_OUTER_IPV4 | > + PKT_TX_IPV6 | PKT_TX_IPV4)) { Hi Alvin, Could we define a new macro like I40E_SIMPLE_TX_OFFLOAD_NOTSUP_MASK as what I40E_TX_OFFLOAD_NOTSUP_MASK did. That would have nice readability. Thanks! > rte_errno = ENOTSUP; > return i; > } > -- > 1.8.3.1
Tx offload flags 'PKT_TX_IPV6, PKT_TX_IPV4, PKT_TX_OUTER_IPV6, PKT_TX_OUTER_IPV4' are supported in simple datapath. This patch removes these offload flags from packet checking in simple Tx datapath and defines 2 macro I40E_TX_OFFLOAD_SIMPLE_SUP_MASK and I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK. Fixes: 146ffa81d05e ("net/i40e: add Tx preparation for simple Tx datapath") Cc: stable@dpdk.org Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com> --- drivers/net/i40e/i40e_rxtx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 02cf5e7..337916b 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -72,6 +72,15 @@ #define I40E_TX_OFFLOAD_NOTSUP_MASK \ (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK) +#define I40E_TX_OFFLOAD_SIMPLE_SUP_MASK ( \ + PKT_TX_IPV4 | \ + PKT_TX_IPV6 | \ + PKT_TX_OUTER_IPV4 | \ + PKT_TX_OUTER_IPV6) + +#define I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK \ + (PKT_TX_OFFLOAD_MASK & ~I40E_TX_OFFLOAD_SIMPLE_SUP_MASK) + int i40e_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc) { @@ -1501,7 +1510,7 @@ return i; } - if (ol_flags & PKT_TX_OFFLOAD_MASK) { + if (ol_flags & I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK) { rte_errno = ENOTSUP; return i; } -- 1.8.3.1
> -----Original Message----- > From: Zhang, AlvinX <alvinx.zhang@intel.com> > Sent: Tuesday, May 11, 2021 10:39 AM > To: Xing, Beilei <beilei.xing@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/i40e: fix offload flag checking in simple Tx datapath > > Tx offload flags 'PKT_TX_IPV6, PKT_TX_IPV4, PKT_TX_OUTER_IPV6, > PKT_TX_OUTER_IPV4' are supported in simple datapath. > > This patch removes these offload flags from packet checking in simple Tx > datapath and defines 2 macro I40E_TX_OFFLOAD_SIMPLE_SUP_MASK and > I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK. > > Fixes: 146ffa81d05e ("net/i40e: add Tx preparation for simple Tx datapath") > Cc: stable@dpdk.org > > Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com> > --- > drivers/net/i40e/i40e_rxtx.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index > 02cf5e7..337916b 100644 > --- a/drivers/net/i40e/i40e_rxtx.c > +++ b/drivers/net/i40e/i40e_rxtx.c > @@ -72,6 +72,15 @@ > #define I40E_TX_OFFLOAD_NOTSUP_MASK \ > (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK) > > +#define I40E_TX_OFFLOAD_SIMPLE_SUP_MASK ( \ > + PKT_TX_IPV4 | \ > + PKT_TX_IPV6 | \ > + PKT_TX_OUTER_IPV4 | \ > + PKT_TX_OUTER_IPV6) > + > +#define I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK \ > + (PKT_TX_OFFLOAD_MASK & > ~I40E_TX_OFFLOAD_SIMPLE_SUP_MASK) Hi Alvin, Better to use ^ oprand here, think about the situation when setting a flag in I40E_TX_OFFLOAD_SIMPLE_SUP_MASK but not in the PKT_TX_OFFLOAD_MASK, the result is going to be unexpected. > + > int > i40e_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc) > { @@ -1501,7 +1510,7 @@ > return i; > } > > - if (ol_flags & PKT_TX_OFFLOAD_MASK) { > + if (ol_flags & I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK) { > rte_errno = ENOTSUP; > return i; > } > -- > 1.8.3.1
Tx offload flags 'PKT_TX_IPV6, PKT_TX_IPV4, PKT_TX_OUTER_IPV6, PKT_TX_OUTER_IPV4' are supported in simple datapath. This patch removes these offload flags from packet checking in simple Tx datapath and defines 2 macro I40E_TX_OFFLOAD_SIMPLE_SUP_MASK and I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK. Fixes: 146ffa81d05e ("net/i40e: add Tx preparation for simple Tx datapath") Cc: stable@dpdk.org Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com> --- v3: Update codes according to comments --- drivers/net/i40e/i40e_rxtx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 02cf5e7..337916b 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -72,6 +72,15 @@ #define I40E_TX_OFFLOAD_NOTSUP_MASK \ (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK) +#define I40E_TX_OFFLOAD_SIMPLE_SUP_MASK ( \ + PKT_TX_IPV4 | \ + PKT_TX_IPV6 | \ + PKT_TX_OUTER_IPV4 | \ + PKT_TX_OUTER_IPV6) + +#define I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK \ + (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_SIMPLE_SUP_MASK) + int i40e_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc) { @@ -1501,7 +1510,7 @@ return i; } - if (ol_flags & PKT_TX_OFFLOAD_MASK) { + if (ol_flags & I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK) { rte_errno = ENOTSUP; return i; } -- 1.8.3.1
> -----Original Message-----
> From: Zhang, AlvinX <alvinx.zhang@intel.com>
> Sent: Tuesday, May 11, 2021 4:46 PM
> To: Xing, Beilei <beilei.xing@intel.com>; Rong, Leyi <leyi.rong@intel.com>
> Cc: dev@dpdk.org; Zhang, AlvinX <alvinx.zhang@intel.com>; stable@dpdk.org
> Subject: [PATCH v3] net/i40e: fix offload flag checking in simple Tx datapath
>
> Tx offload flags 'PKT_TX_IPV6, PKT_TX_IPV4, PKT_TX_OUTER_IPV6,
> PKT_TX_OUTER_IPV4' are supported in simple datapath.
>
> This patch removes these offload flags from packet checking in simple Tx
> datapath and defines 2 macro I40E_TX_OFFLOAD_SIMPLE_SUP_MASK and
> I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK.
>
> Fixes: 146ffa81d05e ("net/i40e: add Tx preparation for simple Tx datapath")
> Cc: stable@dpdk.org
>
> Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
> ---
>
> v3: Update codes according to comments
> ---
> drivers/net/i40e/i40e_rxtx.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index
> 02cf5e7..337916b 100644
> --- a/drivers/net/i40e/i40e_rxtx.c
> +++ b/drivers/net/i40e/i40e_rxtx.c
> @@ -72,6 +72,15 @@
> #define I40E_TX_OFFLOAD_NOTSUP_MASK \
> (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK)
>
> +#define I40E_TX_OFFLOAD_SIMPLE_SUP_MASK ( \
> + PKT_TX_IPV4 | \
> + PKT_TX_IPV6 | \
> + PKT_TX_OUTER_IPV4 | \
> + PKT_TX_OUTER_IPV6)
> +
> +#define I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK \
> + (PKT_TX_OFFLOAD_MASK ^
> I40E_TX_OFFLOAD_SIMPLE_SUP_MASK)
> +
> int
> i40e_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc)
> { @@ -1501,7 +1510,7 @@
> return i;
> }
>
> - if (ol_flags & PKT_TX_OFFLOAD_MASK) {
> + if (ol_flags & I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK) {
> rte_errno = ENOTSUP;
> return i;
> }
> --
> 1.8.3.1
Acked-by: Leyi Rong <leyi.rong@intel.com>
> -----Original Message-----
> From: Rong, Leyi <leyi.rong@intel.com>
> Sent: Tuesday, May 11, 2021 5:20 PM
> To: Zhang, AlvinX <alvinx.zhang@intel.com>; Xing, Beilei
> <beilei.xing@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: RE: [PATCH v3] net/i40e: fix offload flag checking in simple Tx
> datapath
>
>
> > -----Original Message-----
> > From: Zhang, AlvinX <alvinx.zhang@intel.com>
> > Sent: Tuesday, May 11, 2021 4:46 PM
> > To: Xing, Beilei <beilei.xing@intel.com>; Rong, Leyi
> > <leyi.rong@intel.com>
> > Cc: dev@dpdk.org; Zhang, AlvinX <alvinx.zhang@intel.com>;
> > stable@dpdk.org
> > Subject: [PATCH v3] net/i40e: fix offload flag checking in simple Tx
> > datapath
> >
> > Tx offload flags 'PKT_TX_IPV6, PKT_TX_IPV4, PKT_TX_OUTER_IPV6,
> > PKT_TX_OUTER_IPV4' are supported in simple datapath.
> >
> > This patch removes these offload flags from packet checking in simple
> > Tx datapath and defines 2 macro I40E_TX_OFFLOAD_SIMPLE_SUP_MASK
> and
> > I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK.
> >
> > Fixes: 146ffa81d05e ("net/i40e: add Tx preparation for simple Tx
> > datapath")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
> > ---
> >
> > v3: Update codes according to comments
> > ---
> > drivers/net/i40e/i40e_rxtx.c | 11 ++++++++++-
> > 1 file changed, 10 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/i40e/i40e_rxtx.c
> > b/drivers/net/i40e/i40e_rxtx.c index 02cf5e7..337916b 100644
> > --- a/drivers/net/i40e/i40e_rxtx.c
> > +++ b/drivers/net/i40e/i40e_rxtx.c
> > @@ -72,6 +72,15 @@
> > #define I40E_TX_OFFLOAD_NOTSUP_MASK \
> > (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK)
> >
> > +#define I40E_TX_OFFLOAD_SIMPLE_SUP_MASK ( \
> > + PKT_TX_IPV4 | \
> > + PKT_TX_IPV6 | \
> > + PKT_TX_OUTER_IPV4 | \
> > + PKT_TX_OUTER_IPV6)
> > +
> > +#define I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK \
> > + (PKT_TX_OFFLOAD_MASK ^
> > I40E_TX_OFFLOAD_SIMPLE_SUP_MASK)
> > +
> > int
> > i40e_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond
> > *pmc) { @@ -1501,7 +1510,7 @@
> > return i;
> > }
> >
> > - if (ol_flags & PKT_TX_OFFLOAD_MASK) {
> > + if (ol_flags & I40E_TX_OFFLOAD_SIMPLE_NOTSUP_MASK) {
> > rte_errno = ENOTSUP;
> > return i;
> > }
> > --
> > 1.8.3.1
>
> Acked-by: Leyi Rong <leyi.rong@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi