From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A3471A0524 for ; Thu, 4 Feb 2021 12:30:35 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A2D3240736; Thu, 4 Feb 2021 12:30:35 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id B7D0024071B for ; Thu, 4 Feb 2021 12:30:33 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cqH-000545-Hk; Thu, 04 Feb 2021 11:30:33 +0000 From: Christian Ehrhardt To: Murphy Yang Cc: Wei Xie , Qi Zhang , dpdk stable Date: Thu, 4 Feb 2021 12:27:49 +0100 Message-Id: <20210204112954.2488123-14-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix outer UDP Tx checksum offload' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/5319ac800171dcb06cec001973e1ad23fa32ae0c Thanks. Christian Ehrhardt --- >From 5319ac800171dcb06cec001973e1ad23fa32ae0c Mon Sep 17 00:00:00 2001 From: Murphy Yang Date: Mon, 23 Nov 2020 07:05:23 +0000 Subject: [PATCH] net/ice: fix outer UDP Tx checksum offload [ upstream commit 2ed011776334a742296f2495e2e0c76a7354e7af ] If hardware outer UDP Tx checksum offload enabled, it doesn't take effect when 'IPv6/UDP/VXLAN' packet sent with wrong 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 Tested-by: Wei Xie Acked-by: Qi Zhang --- 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 3030550bdc..42c6b82d23 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2215,8 +2215,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.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:28.785900174 +0100 +++ 0014-net-ice-fix-outer-UDP-Tx-checksum-offload.patch 2021-02-04 12:04:27.830789535 +0100 @@ -1 +1 @@ -From 2ed011776334a742296f2495e2e0c76a7354e7af Mon Sep 17 00:00:00 2001 +From 5319ac800171dcb06cec001973e1ad23fa32ae0c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2ed011776334a742296f2495e2e0c76a7354e7af ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 5fbd68eafc..9769e216bf 100644 +index 3030550bdc..42c6b82d23 100644 @@ -27 +28 @@ -@@ -2319,8 +2319,11 @@ ice_parse_tunneling_params(uint64_t ol_flags, +@@ -2215,8 +2215,11 @@ ice_parse_tunneling_params(uint64_t ol_flags,