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 BDB9641D52 for ; Thu, 23 Feb 2023 16:08:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B941A432AE; Thu, 23 Feb 2023 16:08:31 +0100 (CET) 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 F3514432AD for ; Thu, 23 Feb 2023 16:08:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164909; 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=FQuy4Hn6jiAKTZ4oXUk1Qo7bXXRr1rPiz+uTMwuY01c=; b=gdAl40k7XMecPW+L8yy9FBdccGulXEu4hPbFivA99uW7Wa9B3n+H8oIwe3klN6+cZi4W14 m/OuP91bh5bZAjvxTx7ZGK2pCUqiEL5P7OcVG9Uf/2R5jrnWl4WdrPxKwW/jBfMBrq1PQK k+10ZcTH/+lo/KFw0m+lrS+BDRQQg24= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-452-WmleC_mLMYaRdDGvMAFm1w-1; Thu, 23 Feb 2023 10:08:26 -0500 X-MC-Unique: WmleC_mLMYaRdDGvMAFm1w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CD5683C0E467; Thu, 23 Feb 2023 15:08:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2899B2166B29; Thu, 23 Feb 2023 15:08:25 +0000 (UTC) From: Kevin Traynor To: Zhichao Zeng Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix building data desc' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:06:13 +0000 Message-Id: <20230223150631.723699-82-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/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/7cdea129b8176d321a112828566f7bc754601c94 Thanks. Kevin --- >From 7cdea129b8176d321a112828566f7bc754601c94 Mon Sep 17 00:00:00 2001 From: Zhichao Zeng Date: Thu, 12 Jan 2023 17:31:51 +0800 Subject: [PATCH] net/iavf: fix building data desc [ upstream commit d082b37d081e6de467700128f217e14b5e852bf6 ] Build correct data desc for UFO pkt by adding UDP_SEG flag, and disable L4 checksum offload when TSO/UFO is enabled to prevent the MDD. Fixes: 1e728b01120c ("net/iavf: rework Tx path") Signed-off-by: Zhichao Zeng Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index da3f1baabd..2211297220 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2457,8 +2457,19 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, } - if (m->ol_flags & RTE_MBUF_F_TX_TCP_SEG) { - command |= IAVF_TX_DESC_CMD_L4T_EOFT_TCP; + if (m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG)) { + if (m->ol_flags & RTE_MBUF_F_TX_TCP_SEG) + command |= IAVF_TX_DESC_CMD_L4T_EOFT_TCP; + else + command |= IAVF_TX_DESC_CMD_L4T_EOFT_UDP; offset |= (m->l4_len >> 2) << IAVF_TX_DESC_LENGTH_L4_FC_LEN_SHIFT; + + *qw1 = rte_cpu_to_le_64((((uint64_t)command << + IAVF_TXD_DATA_QW1_CMD_SHIFT) & IAVF_TXD_DATA_QW1_CMD_MASK) | + (((uint64_t)offset << IAVF_TXD_DATA_QW1_OFFSET_SHIFT) & + IAVF_TXD_DATA_QW1_OFFSET_MASK) | + ((uint64_t)l2tag1 << IAVF_TXD_DATA_QW1_L2TAG1_SHIFT)); + + return; } -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:25.785770556 +0000 +++ 0082-net-iavf-fix-building-data-desc.patch 2023-02-23 14:46:23.866236300 +0000 @@ -1 +1 @@ -From d082b37d081e6de467700128f217e14b5e852bf6 Mon Sep 17 00:00:00 2001 +From 7cdea129b8176d321a112828566f7bc754601c94 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d082b37d081e6de467700128f217e14b5e852bf6 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 8d49967538..3d9224b38d 100644 +index da3f1baabd..2211297220 100644 @@ -22 +23 @@ -@@ -2620,8 +2620,19 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, +@@ -2457,8 +2457,19 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,