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 6A1724326F for ; Thu, 2 Nov 2023 14:14:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 309A442E0A; Thu, 2 Nov 2023 14:14:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.145.221.124]) by mails.dpdk.org (Postfix) with ESMTP id 93AC2427DD for ; Thu, 2 Nov 2023 14:14:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930865; 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=cWBawtEjqd7bOWjtaltMCpmOIR9xS7/T3/Ah2Q+P1nk=; b=V3SrqP06/P9jFqlRVSxu8NqE0Uv+B97J5+2JnszmTX1+Z/FYCsNzByO0MbR3SNjje8v9sh V+cuiUw+HfDgAo7LPv17Ak4H+l7f8WWnGPY5le5MgojT+bfVznMZb42RmmCnF3FtjjQ8xH tH6iL6KNzUg/dFdQ/0/kHTYWw4bAtl0= 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-2-p9_qPbXIOpalHsS9EfDv3w-1; Thu, 02 Nov 2023 09:14:23 -0400 X-MC-Unique: p9_qPbXIOpalHsS9EfDv3w-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 835EE1C04328; Thu, 2 Nov 2023 13:14:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79133492BFA; Thu, 2 Nov 2023 13:14:22 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix checksum offloading' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:02 +0000 Message-ID: <20231102131254.315947-56-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.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.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/08/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/bf23d4ca4785eef62723969dd03b3826975b2509 Thanks. Kevin --- >From bf23d4ca4785eef62723969dd03b3826975b2509 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 23 Aug 2023 08:29:11 +0200 Subject: [PATCH] net/iavf: fix checksum offloading [ upstream commit 3c715591ece0771b7a5503ffe5340c6f3cc1cb62 ] l2_len and l3_len fields are related to Tx offloading features. It is undefined in the DPDK API what those fields may contain if an application did not request a Tx offload. Skip reading them if no Tx offloads has been requested. Fixes: 1e728b01120c ("net/iavf: rework Tx path") Signed-off-by: David Marchand Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 19b46b2a5d..1881f97803 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2441,4 +2441,7 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, } + if ((m->ol_flags & IAVF_TX_CKSUM_OFFLOAD_MASK) == 0) + goto skip_cksum; + /* Set MACLEN */ offset |= (m->l2_len >> 1) << IAVF_TX_DESC_LENGTH_MACLEN_SHIFT; @@ -2494,4 +2497,5 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, } +skip_cksum: *qw1 = rte_cpu_to_le_64((((uint64_t)command << IAVF_TXD_DATA_QW1_CMD_SHIFT) & IAVF_TXD_DATA_QW1_CMD_MASK) | -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:42.189140254 +0000 +++ 0056-net-iavf-fix-checksum-offloading.patch 2023-11-02 13:09:40.864163499 +0000 @@ -1 +1 @@ -From 3c715591ece0771b7a5503ffe5340c6f3cc1cb62 Mon Sep 17 00:00:00 2001 +From bf23d4ca4785eef62723969dd03b3826975b2509 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3c715591ece0771b7a5503ffe5340c6f3cc1cb62 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index f7df4665d1..33b0f9f482 100644 +index 19b46b2a5d..1881f97803 100644 @@ -26 +27 @@ -@@ -2644,4 +2644,7 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, +@@ -2441,4 +2441,7 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, @@ -33,2 +34,2 @@ - if (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK && -@@ -2703,4 +2706,5 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, + offset |= (m->l2_len >> 1) << IAVF_TX_DESC_LENGTH_MACLEN_SHIFT; +@@ -2494,4 +2497,5 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,