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 BC2F342CBC for ; Thu, 15 Jun 2023 03:36:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5F0842D5C; Thu, 15 Jun 2023 03:36:05 +0200 (CEST) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 2F48A42D4B for ; Thu, 15 Jun 2023 03:36:03 +0200 (CEST) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-31109cd8d8cso1073052f8f.2 for ; Wed, 14 Jun 2023 18:36:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792963; x=1689384963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6fOtM3qrqVCneVRVPd6OMqqPITY5cMjMX594g0Cwjnc=; b=KFmlcGKietWGL/49CRA3VGZ3jN2Jhb54v/BiNhPAZbgoghqP7cpYJE0r8kquGRkZRp QjJiAVEYpaAzDDNRLqWwUYoJAIMM6iyJE3S0IUTsjqczJ9fMpGZbq+ibn9ogszww4pue sozcNZofmm50tvJImMVcDVraGR5gXyLBaUk8b87eytjCuXHAjI2M/QEfS0DcrWQ4Mr49 H9nc3nU/BEKmyZjXf48wEMARCNL78G5BaKk9mMJjgd42v6fIleKKqhvCf91qACjzreWC eLDJzqKyoPQAvthmq+VcN6ZTo2r5cbg/iFX2TccTCjBouPkrJ+FpCBFW00r9uOTlOl+i e4zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792963; x=1689384963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6fOtM3qrqVCneVRVPd6OMqqPITY5cMjMX594g0Cwjnc=; b=azRgZWORRRQC3wK1TFnb5HXykAJuFwIFSXz5/6UmhUV5Q476v6/mBGa6s01Lx/06n9 Q1zBa07Q8lpf6FFuXLCM3ZBYEjbtk6uQXC2Ly6ExqU8Ovj10yIj/rGY80wMfYYdSPOFi 1tICNLpKMu2f/S5GeayfWOxObOrJhgAVWchWZ6hTvjZas81DbQOuToaRDv051gLYtHfp TzHatcdyggu7sBDwQJANBZ34mZBpY/eYVlQGl2mv4NMghSMmRhnGp5SWBFSSPhdOBjPr uc3AhAb3rfCQPt1E0gfln7MP9RxllW5DZoeQW5MdlPR04Eh0rnmnR9wDX7Zsk/hqr6/+ pEhg== X-Gm-Message-State: AC+VfDxlj5rBjaC8MWazlnhat/J8smCmT0oy4d7mXW+GDtQwyvkSqhny bKmmoB6zqZw6kVGBBxVexgdUKe+pU1SQ39wm X-Google-Smtp-Source: ACHHUZ6I3PUBKh6Vh/JLOAGiZlTXv19q5w/pW3S7UAiWenQ8UxuFtDHj2nzVYQ1RkLIkYqBEOy2/9w== X-Received: by 2002:adf:fb4a:0:b0:306:39a8:6fa2 with SMTP id c10-20020adffb4a000000b0030639a86fa2mr9363926wrs.61.1686792962781; Wed, 14 Jun 2023 18:36:02 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id l6-20020a5d4bc6000000b003047ae72b14sm19623315wrt.82.2023.06.14.18.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:36:02 -0700 (PDT) From: luca.boccassi@gmail.com To: Zhichao Zeng Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix outer UDP checksum offload' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:54 +0100 Message-Id: <20230615013258.1439718-59-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/4e5c2b73e7f814c8a6d5b231f3a499d34b9e0c2a Thanks. Luca Boccassi --- >From 4e5c2b73e7f814c8a6d5b231f3a499d34b9e0c2a 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 699bf7bb64..87cb7e8e8d 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2344,7 +2344,8 @@ ice_parse_tunneling_params(uint64_t ol_flags, * 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_UDP_TUNNELING) && + (ol_flags & PKT_TX_OUTER_UDP_CKSUM)) *cd_tunneling |= ICE_TXD_CTX_QW0_L4T_CS_M; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:37.666907426 +0100 +++ 0059-net-ice-fix-outer-UDP-checksum-offload.patch 2023-06-15 01:56:34.723544712 +0100 @@ -1 +1 @@ -From 10fbf1af4c5548b85b4791d241cdef62755240b1 Mon Sep 17 00:00:00 2001 +From 4e5c2b73e7f814c8a6d5b231f3a499d34b9e0c2a 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 699bf7bb64..87cb7e8e8d 100644 @@ -27 +28 @@ -@@ -2734,7 +2734,8 @@ ice_parse_tunneling_params(uint64_t ol_flags, +@@ -2344,7 +2344,8 @@ ice_parse_tunneling_params(uint64_t ol_flags, @@ -33 +34 @@ -+ (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM)) ++ (ol_flags & PKT_TX_OUTER_UDP_CKSUM))