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 B5B5342ECF for ; Thu, 20 Jul 2023 17:24:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B296F40685; Thu, 20 Jul 2023 17:24:01 +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 5B419400D6 for ; Thu, 20 Jul 2023 17:24:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866639; 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=Xdnln/9QiVU7lzMmISanajbuNM0cPTBQ/hejDyRz/mQ=; b=HNRl/N5YdbsZREtK85TNAUfdwyMNJrs9BDgJ/qm8QWGJOsNhptoKpkuMbNaQxWgBTaiGdh S0GMFwjTTJgpZHiTcK5vXaL5ao20hguZPlo00bH2ls8W0GFRDum9zr1cyhtZtPOTHQuPbc ZpEPijtgoridxe215+I2JAjk8hqxKhM= 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-241-cUzy05RXM8e16xs-i9w21A-1; Thu, 20 Jul 2023 11:23:10 -0400 X-MC-Unique: cUzy05RXM8e16xs-i9w21A-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBBC210504AA; Thu, 20 Jul 2023 15:22:30 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9CE24A9004; Thu, 20 Jul 2023 15:22:29 +0000 (UTC) From: Kevin Traynor To: Shiyang He Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix tunnel packet Tx descriptor' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:50 +0100 Message-ID: <20230720151942.262154-99-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/48faf86ccf75da1290a06e9fe0b5a15ae435e660 Thanks. Kevin --- >From 48faf86ccf75da1290a06e9fe0b5a15ae435e660 Mon Sep 17 00:00:00 2001 From: Shiyang He Date: Thu, 8 Jun 2023 10:19:04 +0000 Subject: [PATCH] net/ice: fix tunnel packet Tx descriptor [ upstream commit c261e7de45d38ddc3b4b8909c35b448c5e1b0fcf ] The TX descriptor of tunnel packet filled incorrectly due to the MACLEN is not set. This patch fixes this issue by setting MACLEN to correctly fill the TX descriptor. Fixes: bd70c451532c ("net/ice: support Tx checksum offload for tunnel") Signed-off-by: Shiyang He Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index f0d0a58c61..19bc94b6a6 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2561,8 +2561,5 @@ ice_txd_enable_checksum(uint64_t ol_flags, { /* Set MACLEN */ - if (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) - *td_offset |= (tx_offload.outer_l2_len >> 1) - << ICE_TX_DESC_LEN_MACLEN_S; - else + if (!(ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)) *td_offset |= (tx_offload.l2_len >> 1) << ICE_TX_DESC_LEN_MACLEN_S; @@ -2825,7 +2822,10 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) /* Fill in tunneling parameters if necessary */ cd_tunneling_params = 0; - if (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) + if (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) { + td_offset |= (tx_offload.outer_l2_len >> 1) + << ICE_TX_DESC_LEN_MACLEN_S; ice_parse_tunneling_params(ol_flags, tx_offload, &cd_tunneling_params); + } /* Enable checksum offloading */ -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:07.119231032 +0100 +++ 0099-net-ice-fix-tunnel-packet-Tx-descriptor.patch 2023-07-20 16:17:55.037752043 +0100 @@ -1 +1 @@ -From c261e7de45d38ddc3b4b8909c35b448c5e1b0fcf Mon Sep 17 00:00:00 2001 +From 48faf86ccf75da1290a06e9fe0b5a15ae435e660 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c261e7de45d38ddc3b4b8909c35b448c5e1b0fcf ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 665ae32c13..598edb29c9 100644 +index f0d0a58c61..19bc94b6a6 100644 @@ -25 +26 @@ -@@ -2747,8 +2747,5 @@ ice_txd_enable_checksum(uint64_t ol_flags, +@@ -2561,8 +2561,5 @@ ice_txd_enable_checksum(uint64_t ol_flags, @@ -35 +36 @@ -@@ -3011,7 +3008,10 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -2825,7 +2822,10 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)