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 E5A1943345 for ; Thu, 16 Nov 2023 14:24:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0B4440E5E; Thu, 16 Nov 2023 14:24:54 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id D6C2C40DF5 for ; Thu, 16 Nov 2023 14:24:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141092; 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=Qe6UjGlyrTIwn0zkcle9tj7SpSR25vFOreJ5GuXRzg4=; b=JAGc5tPw8SS5nOHeAqxKNpFFmYbPEVpnFeNz5rG1adksfJzsjA9I+sf5IUjMnj9SuRnn1l sWMbuRE6WRofnKX5V4/HDtwo70dzAgyPr38JLGyNut9puacGljrT7hXeJ4fn6KOpIITCVV lIY/mCmq/1v5LINmZhtLQyKu8XEHm30= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-111-p0POJw36NGmxLvL40bcdrA-1; Thu, 16 Nov 2023 08:24:49 -0500 X-MC-Unique: p0POJw36NGmxLvL40bcdrA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 274F73C0FC87; Thu, 16 Nov 2023 13:24:49 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 502DA2166B27; Thu, 16 Nov 2023 13:24:48 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: David Marchand , dpdk stable Subject: patch 'net/iavf: fix Tx offload flags check' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:19 +0000 Message-ID: <20231116132348.557257-37-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/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/7fd13314d312ef2025a6b8578ea3ed12564c783d Thanks. Kevin --- >From 7fd13314d312ef2025a6b8578ea3ed12564c783d Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Wed, 25 Oct 2023 10:12:58 +0100 Subject: [PATCH] net/iavf: fix Tx offload flags check [ upstream commit 55f6cfe9ba8cebddd786f0f6bf5b9baad97fdfad ] Relax the check in the previous fix to allow packets with security offload flag set. Fixes: 3c715591ece0 ("net/iavf: fix checksum offloading") Signed-off-by: Radu Nicolau Acked-by: David Marchand --- drivers/net/iavf/iavf_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index e810d27bea..b2789c1a48 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2441,5 +2441,6 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, } - if ((m->ol_flags & IAVF_TX_CKSUM_OFFLOAD_MASK) == 0) + if ((m->ol_flags & + (IAVF_TX_CKSUM_OFFLOAD_MASK | RTE_MBUF_F_TX_SEC_OFFLOAD)) == 0) goto skip_cksum; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.450119886 +0000 +++ 0037-net-iavf-fix-Tx-offload-flags-check.patch 2023-11-16 13:21:52.493946500 +0000 @@ -1 +1 @@ -From 55f6cfe9ba8cebddd786f0f6bf5b9baad97fdfad Mon Sep 17 00:00:00 2001 +From 7fd13314d312ef2025a6b8578ea3ed12564c783d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 55f6cfe9ba8cebddd786f0f6bf5b9baad97fdfad ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 9890a31734..610912f635 100644 +index e810d27bea..b2789c1a48 100644 @@ -22 +23 @@ -@@ -2667,5 +2667,6 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, +@@ -2441,5 +2441,6 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,