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 7346E42ECF for ; Thu, 20 Jul 2023 17:23:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6E9CE40685; Thu, 20 Jul 2023 17:23:55 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 238C4400D6 for ; Thu, 20 Jul 2023 17:23:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pGGaYIo7Nwrd+lGIa9ibRUYg/2x4SJkMrD3P+GfP2qw=; b=XpqYaPycDrOA8TJatN9quzy0LHt8yf9DdRztwLIALQBIcMvfjjBLZOGFn5z8FKbxPiHvmJ AXIc1oR62kUOoXG9mdxPxy5uBO9z5uHxGbDHem3JUmzGu7GkTn49SWAvznUafW439HZ7bY 2jHN6UulYs3XfnuCg4vIUzMv8sQQW7s= Received: from mimecast-mx02.redhat.com (66.187.233.88 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-20-Da384VJfNJiVQ_Lisq2iGw-1; Thu, 20 Jul 2023 11:22:47 -0400 X-MC-Unique: Da384VJfNJiVQ_Lisq2iGw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CC5571871CCE; Thu, 20 Jul 2023 15:21:55 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2DDE4CD0E3; Thu, 20 Jul 2023 15:21:54 +0000 (UTC) From: Kevin Traynor To: Zhichao Zeng Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix outer UDP checksum offload' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:27 +0100 Message-ID: <20230720151942.262154-76-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/7b8888a456068a6cd8eadd19b1f8f93da4eb75eb Thanks. Kevin --- >From 7b8888a456068a6cd8eadd19b1f8f93da4eb75eb Mon Sep 17 00:00:00 2001 From: Zhichao Zeng Date: Fri, 2 Jun 2023 09:42:53 +0800 Subject: [PATCH] net/ice: fix outer UDP checksum offload [ upstream commit 10fbf1af4c5548b85b4791d241cdef62755240b1 ] Currently, when dealing with UDP tunnel pkts checksum offloading, the outer-udp checksum will be offloaded by default. So the 'csum set outer-udp hw/sw' command does not work. This patch fixes judgment of the EIPT flag and enables the 'csum set outer-udp hw/sw' command by adding judgment for the outer-udp checksum offload flag. Fixes: bd70c451532c ("net/ice: support Tx checksum offload for tunnel") Signed-off-by: Zhichao Zeng Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 9ad8793709..f0d0a58c61 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2549,5 +2549,6 @@ ice_parse_tunneling_params(uint64_t ol_flags, */ if (!(*cd_tunneling & ICE_TX_CTX_EIPT_NONE) && - (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING)) + (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING) && + (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM)) *cd_tunneling |= ICE_TXD_CTX_QW0_L4T_CS_M; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:04.173994551 +0100 +++ 0076-net-ice-fix-outer-UDP-checksum-offload.patch 2023-07-20 16:17:54.920751566 +0100 @@ -1 +1 @@ -From 10fbf1af4c5548b85b4791d241cdef62755240b1 Mon Sep 17 00:00:00 2001 +From 7b8888a456068a6cd8eadd19b1f8f93da4eb75eb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 10fbf1af4c5548b85b4791d241cdef62755240b1 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 7b6784b177..665ae32c13 100644 +index 9ad8793709..f0d0a58c61 100644 @@ -27 +28 @@ -@@ -2735,5 +2735,6 @@ ice_parse_tunneling_params(uint64_t ol_flags, +@@ -2549,5 +2549,6 @@ ice_parse_tunneling_params(uint64_t ol_flags,