net/ice: fix outer UDP Tx offload checksum error

Message ID 20201123070523.21661-1-murphyx.yang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series net/ice: fix outer UDP Tx offload checksum error |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-testing warning Testing issues
ci/travis-robot success Travis build: passed

Commit Message

Murphy Yang Nov. 23, 2020, 7:05 a.m. UTC
  If enable hardware outer UDP TX offload checksum, it doesn't take effect
when send 'IPv6/UDP/VXLAN' packet with error outer UDP checksum.

In order to take effect, set the 'L4T_CS' flag valid only when 'L4TUNT'
equals one and 'EIPT' is not zero. If 'L4T_CS' flag marked, the hardware
can calculate the outer tunneling UDP checksum.

Fixes: bd70c451532c ("net/ice: support Tx checksum offload for tunnel")

Signed-off-by: Murphy Yang <murphyx.yang@intel.com>
---
 drivers/net/ice/ice_rxtx.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
  

Comments

Xie, WeiX Nov. 23, 2020, 8:30 a.m. UTC | #1
Tested-by:  Xie,WeiX < weix.xie@intel.com>

Regards,
Xie Wei

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Murphy Yang
> Sent: Monday, November 23, 2020 3:05 PM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Yang,
> MurphyX <murphyx.yang@intel.com>
> Subject: [dpdk-dev] [PATCH] net/ice: fix outer UDP Tx offload checksum
> error
> 
> If enable hardware outer UDP TX offload checksum, it doesn't take effect
> when send 'IPv6/UDP/VXLAN' packet with error outer UDP checksum.
> 
> In order to take effect, set the 'L4T_CS' flag valid only when 'L4TUNT'
> equals one and 'EIPT' is not zero. If 'L4T_CS' flag marked, the hardware can
> calculate the outer tunneling UDP checksum.
> 
> Fixes: bd70c451532c ("net/ice: support Tx checksum offload for tunnel")
> 
> Signed-off-by: Murphy Yang <murphyx.yang@intel.com>
> ---
>  drivers/net/ice/ice_rxtx.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index
> 5fbd68eafc..9769e216bf 100644
> --- a/drivers/net/ice/ice_rxtx.c
> +++ b/drivers/net/ice/ice_rxtx.c
> @@ -2319,8 +2319,11 @@ ice_parse_tunneling_params(uint64_t ol_flags,
>  	*cd_tunneling |= (tx_offload.l2_len >> 1) <<
>  		ICE_TXD_CTX_QW0_NATLEN_S;
> 
> -	if ((ol_flags & PKT_TX_OUTER_UDP_CKSUM) &&
> -	    (ol_flags & PKT_TX_OUTER_IP_CKSUM) &&
> +	/**
> +	 * Calculate the tunneling UDP checksum.
> +	 * Shall be set only if L4TUNT = 01b and EIPT is not zero
> +	 */
> +	if (!(*cd_tunneling & ICE_TX_CTX_EIPT_NONE) &&
>  	    (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING))
>  		*cd_tunneling |= ICE_TXD_CTX_QW0_L4T_CS_M;  }
> --
> 2.17.1
  
Qi Zhang Dec. 11, 2020, 2:08 a.m. UTC | #2
> -----Original Message-----
> From: Xie, WeiX <weix.xie@intel.com>
> Sent: Monday, November 23, 2020 4:31 PM
> To: Yang, MurphyX <murphyx.yang@intel.com>; dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> Yang, SteveX <stevex.yang@intel.com>; Yang, MurphyX
> <murphyx.yang@intel.com>
> Subject: RE: [dpdk-dev] [PATCH] net/ice: fix outer UDP Tx offload checksum
> error
> 
> Tested-by:  Xie,WeiX < weix.xie@intel.com>
> 
> Regards,
> Xie Wei
> 
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Murphy Yang
> > Sent: Monday, November 23, 2020 3:05 PM
> > To: dev@dpdk.org
> > Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Yang,
> > MurphyX <murphyx.yang@intel.com>
> > Subject: [dpdk-dev] [PATCH] net/ice: fix outer UDP Tx offload checksum
> > error
> >
> > If enable hardware outer UDP TX offload checksum, it doesn't take
> > effect when send 'IPv6/UDP/VXLAN' packet with error outer UDP checksum.
> >
> > In order to take effect, set the 'L4T_CS' flag valid only when 'L4TUNT'
> > equals one and 'EIPT' is not zero. If 'L4T_CS' flag marked, the
> > hardware can calculate the outer tunneling UDP checksum.
> >
> > Fixes: bd70c451532c ("net/ice: support Tx checksum offload for
> > tunnel")
> >
> > Signed-off-by: Murphy Yang <murphyx.yang@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
  
David Marchand March 29, 2024, 8:26 a.m. UTC | #3
Hello,

On Mon, Nov 23, 2020 at 8:08 AM Murphy Yang <murphyx.yang@intel.com> wrote:
>
> If enable hardware outer UDP TX offload checksum, it doesn't take effect
> when send 'IPv6/UDP/VXLAN' packet with error outer UDP checksum.
>
> In order to take effect, set the 'L4T_CS' flag valid only when 'L4TUNT'
> equals one and 'EIPT' is not zero. If 'L4T_CS' flag marked, the hardware
> can calculate the outer tunneling UDP checksum.
>
> Fixes: bd70c451532c ("net/ice: support Tx checksum offload for tunnel")
>
> Signed-off-by: Murphy Yang <murphyx.yang@intel.com>
> ---
>  drivers/net/ice/ice_rxtx.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
> index 5fbd68eafc..9769e216bf 100644
> --- a/drivers/net/ice/ice_rxtx.c
> +++ b/drivers/net/ice/ice_rxtx.c
> @@ -2319,8 +2319,11 @@ ice_parse_tunneling_params(uint64_t ol_flags,
>         *cd_tunneling |= (tx_offload.l2_len >> 1) <<
>                 ICE_TXD_CTX_QW0_NATLEN_S;
>
> -       if ((ol_flags & PKT_TX_OUTER_UDP_CKSUM) &&
> -           (ol_flags & PKT_TX_OUTER_IP_CKSUM) &&
> +       /**
> +        * Calculate the tunneling UDP checksum.
> +        * Shall be set only if L4TUNT = 01b and EIPT is not zero
> +        */
> +       if (!(*cd_tunneling & ICE_TX_CTX_EIPT_NONE) &&

drivers/net/ice/base/ice_lan_tx_rx.h:   ICE_TX_CTX_EIPT_NONE            = 0x0,
So this check above is always true...

I suspect the intent was:
if ((*cd_tunneling & ICE_TXD_CTX_QW0_EIPT_M) != ICE_TX_CTX_EIPT_NONE)

>             (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING))
>                 *cd_tunneling |= ICE_TXD_CTX_QW0_L4T_CS_M;
>  }
> --
> 2.17.1
>
  

Patch

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 5fbd68eafc..9769e216bf 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -2319,8 +2319,11 @@  ice_parse_tunneling_params(uint64_t ol_flags,
 	*cd_tunneling |= (tx_offload.l2_len >> 1) <<
 		ICE_TXD_CTX_QW0_NATLEN_S;
 
-	if ((ol_flags & PKT_TX_OUTER_UDP_CKSUM) &&
-	    (ol_flags & PKT_TX_OUTER_IP_CKSUM) &&
+	/**
+	 * Calculate the tunneling UDP checksum.
+	 * Shall be set only if L4TUNT = 01b and EIPT is not zero
+	 */
+	if (!(*cd_tunneling & ICE_TX_CTX_EIPT_NONE) &&
 	    (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING))
 		*cd_tunneling |= ICE_TXD_CTX_QW0_L4T_CS_M;
 }