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 15571A054A for ; Tue, 25 Oct 2022 17:09:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1165842C34; Tue, 25 Oct 2022 17:09:03 +0200 (CEST) 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 D7A5142C1D for ; Tue, 25 Oct 2022 17:09:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710541; 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=jQ3B9FbkthhdiHgkN44KSZZDiRL9WSLA3hDPbQOrU5o=; b=UxBPKAIjkfDak4pJGoMwpiWvyuro2k3IjtNaiXjnKVnzikzL/XoXSeojqQ4qlMp+YMsxyJ 5JkqDBADddPxKB9QN8OzXqNwTXXZqlwU4Kn+eJHJjfubL1yyuChVbQae9N6ecBnkP2Pm8U 9kXhuzJRO07heW0PmQxDQDC+bJp7+Tk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [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-197-e_RYyGyxOgirMx-JfGE_XA-1; Tue, 25 Oct 2022 11:08:59 -0400 X-MC-Unique: e_RYyGyxOgirMx-JfGE_XA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CBD14858F13; Tue, 25 Oct 2022 15:08:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA5F94B400F; Tue, 25 Oct 2022 15:08:57 +0000 (UTC) From: Kevin Traynor To: Ke Zhang Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix L3 checksum Tx offload flag' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:38 +0100 Message-Id: <20221025150734.142189-43-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.3 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/01/22. 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/301e4cc87b15205000b44b2dc42725e3b2b9b952 Thanks. Kevin --- >From 301e4cc87b15205000b44b2dc42725e3b2b9b952 Mon Sep 17 00:00:00 2001 From: Ke Zhang Date: Wed, 10 Aug 2022 17:57:07 +0800 Subject: [PATCH] net/iavf: fix L3 checksum Tx offload flag [ upstream commit 817577c03afe7590b3212383e4e690e66d266e3f ] When ol_flag is only RTE_MBUF_F_TX_IPV4, the Tx L3 checksum offload is still configured to IIPT in the command field of Tx data descriptor. This patch is to fix the issue to make the Tx L3 checksum offload flags and Tx data descriptor consistent. Fixes: 1e728b01120c ("net/iavf: rework Tx path") Signed-off-by: Ke Zhang Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 3a0dfca2a7..285aeebff6 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2427,7 +2427,9 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, /* Enable L3 checksum offloading inner */ - if (m->ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_IPV4)) { - command |= IAVF_TX_DESC_CMD_IIPT_IPV4_CSUM; - offset |= (m->l3_len >> 2) << IAVF_TX_DESC_LENGTH_IPLEN_SHIFT; + if (m->ol_flags & RTE_MBUF_F_TX_IP_CKSUM) { + if (m->ol_flags & RTE_MBUF_F_TX_IPV4) { + command |= IAVF_TX_DESC_CMD_IIPT_IPV4_CSUM; + offset |= (m->l3_len >> 2) << IAVF_TX_DESC_LENGTH_IPLEN_SHIFT; + } } else if (m->ol_flags & RTE_MBUF_F_TX_IPV4) { command |= IAVF_TX_DESC_CMD_IIPT_IPV4; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.512958095 +0100 +++ 0043-net-iavf-fix-L3-checksum-Tx-offload-flag.patch 2022-10-25 14:18:58.407798077 +0100 @@ -1 +1 @@ -From 817577c03afe7590b3212383e4e690e66d266e3f Mon Sep 17 00:00:00 2001 +From 301e4cc87b15205000b44b2dc42725e3b2b9b952 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 817577c03afe7590b3212383e4e690e66d266e3f ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 109ba756f8..dfd021889e 100644 +index 3a0dfca2a7..285aeebff6 100644 @@ -27 +28 @@ -@@ -2539,7 +2539,9 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, +@@ -2427,7 +2427,9 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,