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 6BDC5A0524 for ; Fri, 5 Feb 2021 12:21:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 64D3D1606C6; Fri, 5 Feb 2021 12:21:15 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id A5FC51606C6 for ; Fri, 5 Feb 2021 12:21:14 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id 7so7337426wrz.0 for ; Fri, 05 Feb 2021 03:21:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S+fg82ZyELceAbN8KfJb/SFevi4XRyFhQ9ORzbUMFkk=; b=XfTE7rkow7eEXyG1vkhaydlfWtPbu5E7PGiKxA8/VyLghg9iEua6UQASJS/5iJXR38 rICmBIarmEXF7xC2mqD1h2/0ztQfwtBKEEJRje/bEX5sclcXMxLY7gbKoRnZKMG4u5qO s0YKKcA0IpY6buNMQfllDAfslJiyUmLSPl4AYF2t3iyp1p3U4eEO3cwwDmgeg/lx14iI DL4a4U4ngmtCLoUyafhVrH9fC3t0bwjngE/N0C/iRYYrRN0lZoM7Nbms8ucGWTKFDWMe x1naKuKhbRDMymRWWr1c4SGMoUjzH1v50T6NWRumVszdQ9Rq4FXqa1leVOrrU5UfrxNN mFhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S+fg82ZyELceAbN8KfJb/SFevi4XRyFhQ9ORzbUMFkk=; b=jV/CHm5npnwTSpZAKHG/3YHBMYPWBEemYVoEe0y1XUA2KxiiBI4TvHk5Wq8eLvXAOx 7mIRgdT1fU788BLMZLncu5f5ecECg8J9zbudJ0jLzeclMYLVCkpLkjfhpWlRiNAQBk8W F9JfWKqInrQeJwIhEPCZD0mkzOdKc48xj5aA3eYbF19IeMhuMRAAWThlaryqx4zWItKv 4tBtM1r+/sBDdR0FfdbpCV9GyFeX6jMTXotHXgvl81DP7iAfch1PsyRFDeIgfPv6HAWA 5mHI5liOW4sx6HK5cHjwbCvnrxKSqAcjBA9C0pf3O+ETMhYwVoWkm0j/+3+k7bifCSf1 HGLA== X-Gm-Message-State: AOAM5310Pf36ESWahLU/GWpOcQwFukG2LYp9XZhf4ElS5bOg4txlI8sV P3QHP/rfwJd1AiEy1aDlmZk= X-Google-Smtp-Source: ABdhPJyqC1n6d0M3PcHtem2gbABoP3swRMdb3SDlPzRW22GUtmYMxL+ic4l9ITjls1Yc6tz4dCr4+Q== X-Received: by 2002:a05:6000:1201:: with SMTP id e1mr4531690wrx.112.1612524074420; Fri, 05 Feb 2021 03:21:14 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z15sm11027749wrs.25.2021.02.05.03.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:21:13 -0800 (PST) From: luca.boccassi@gmail.com To: Murphy Yang Cc: Wei Xie , Qi Zhang , dpdk stable Date: Fri, 5 Feb 2021 11:15:21 +0000 Message-Id: <20210205111920.1272063-35-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.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 20.11.1 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 20.11.1 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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/2d573942e7980bd30c750093b054807d332cab81 Thanks. Luca Boccassi --- >From 2d573942e7980bd30c750093b054807d332cab81 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 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.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:30.866049808 +0000 +++ 0035-net-ice-fix-outer-UDP-Tx-checksum-offload.patch 2021-02-05 11:18:28.674688599 +0000 @@ -1 +1 @@ -From 2ed011776334a742296f2495e2e0c76a7354e7af Mon Sep 17 00:00:00 2001 +From 2d573942e7980bd30c750093b054807d332cab81 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2ed011776334a742296f2495e2e0c76a7354e7af ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org