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 AB9A845804 for ; Fri, 23 Aug 2024 18:20:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A64C74336F; Fri, 23 Aug 2024 18:20:43 +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 C96C94336D for ; Fri, 23 Aug 2024 18:20:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430042; 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=UySibHZmbLL8dTgmJRbc5mvVkaHrZcYHIxrHpL7VjUI=; b=CrJVBFMKAJ1zgkC41gfsB33SHYuavER1IcL3AvjdhevfcsKpl0x4YKJghI+nbiYSGNSYJS v6j3WsTaq/trOPwqHi5UhjabF0/gEePLD4Li3gZ1Qt8UHSbnIId4qhKzUpiVj6mxq30G2w 7LcU9pAH9dbj+1MTdhzawPpFoMq8ZBM= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-538-sgLFJXSlMEqbbpGPwkAAYA-1; Fri, 23 Aug 2024 12:20:39 -0400 X-MC-Unique: sgLFJXSlMEqbbpGPwkAAYA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C94C41955D4A; Fri, 23 Aug 2024 16:20:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 856351956053; Fri, 23 Aug 2024 16:20:34 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Bruce Richardson , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Ali Alnubani , dpdk stable Subject: patch 'net/ice: fix check for outer UDP checksum offload' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:36 +0100 Message-ID: <20240823161929.1004778-28-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/c5411472c3afc51d5f4be06301bc9a180281b3f0 Thanks. Kevin --- >From c5411472c3afc51d5f4be06301bc9a180281b3f0 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 18 Apr 2024 10:20:15 +0200 Subject: [PATCH] net/ice: fix check for outer UDP checksum offload MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit f4eb07f031c4a6a0055f3b2773e031cd8000206e ] ICE_TX_CTX_EIPT_NONE == 0. There is a good chance that !(anything & 0) is true :-). While removing this noop check is doable, let's check that the descriptor does contain a outer ip type. Fixes: 2ed011776334 ("net/ice: fix outer UDP Tx checksum offload") Signed-off-by: David Marchand Reviewed-by: Bruce Richardson Acked-by: Morten Brørup Tested-by: Ali Alnubani --- drivers/net/ice/ice_rxtx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 7578bac03e..9995561fe3 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2548,7 +2548,7 @@ 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) && - (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM)) + if ((*cd_tunneling & ICE_TXD_CTX_QW0_EIPT_M) && + (*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.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.810882931 +0100 +++ 0028-net-ice-fix-check-for-outer-UDP-checksum-offload.patch 2024-08-23 17:18:09.649429857 +0100 @@ -1 +1 @@ -From f4eb07f031c4a6a0055f3b2773e031cd8000206e Mon Sep 17 00:00:00 2001 +From c5411472c3afc51d5f4be06301bc9a180281b3f0 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit f4eb07f031c4a6a0055f3b2773e031cd8000206e ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 95a2db3432..10babab231 100644 +index 7578bac03e..9995561fe3 100644 @@ -30 +31 @@ -@@ -2752,7 +2752,7 @@ ice_parse_tunneling_params(uint64_t ol_flags, +@@ -2548,7 +2548,7 @@ ice_parse_tunneling_params(uint64_t ol_flags,