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 1181242D83 for ; Wed, 28 Jun 2023 16:11:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0D03440151; Wed, 28 Jun 2023 16:11:56 +0200 (CEST) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id 10D8C42D35 for ; Wed, 28 Jun 2023 16:11:52 +0200 (CEST) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-313fb7f0f80so2075410f8f.2 for ; Wed, 28 Jun 2023 07:11:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687961512; x=1690553512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kQN3OfiNAuY44Hjb7raf8IWJ90B6poqX0nTUQp84dK8=; b=juTpCEHpfepFWmsCLx2C6gfxhdjVZEG3fZaGj0ySf4IAdog5ppqv3U15Ik3s5xNhWf AKD8mrLodHnrcU6m8PMKYef2jwEb+PUSu9RBx2QKRRgFiL+aiBhOJpfKcsn+xSC7+4tR LbAYT7fuwKUlBIKU6hxXQ0481nMpVHeKu3Lg/6eCxyI02x9oA7NHjBR/BwtOlPDxHSYT 3miayjgxDI8chr8spHqJUkrkEyDWMWDM5F4+Uk0R304BiuurHSAyA/lOkHla0T8iDQ4Z hPyMqvXwkYQnuSXy77EHa6zv0gwNOy7F1Isco1HcghR/K8GATLM//5TFdsHHQsJN6nn0 BT7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687961512; x=1690553512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kQN3OfiNAuY44Hjb7raf8IWJ90B6poqX0nTUQp84dK8=; b=Wevtnf24ZDdeyoMihp+glCy225LK76AFyZpgCiJbxwX83opUXK0J0eIyTUDktqv4Wv LoeOSZTbfOcyJXIYVd1fl0WQWppW4u98AClUDtYoRrPmDEByfDV3JGxvvkSzzlEsQXJP 44KbPRZ/8UGsJ3NROQST+IP6JXXlqE+oLacpNq37s/2QZLrOtVKh1FthBr/ronw16IRn Z2/ldCUtPGeUBogvWTVMoV9iyGRWlKmx211O+qmODvLAaXq8EaglCTWyyyG6zffd9PP/ bfza8vFidPZkJNvjGSwkRCOWVHp6EaR7yOFnOtlS8VfeME2Cn3Be/dM/LrwOqbhTxiqv EP+Q== X-Gm-Message-State: AC+VfDyLiOWFKZoABjX5jfhtb0EaoHch15O3mU9r4g/IZgwcsk9LsD8W E7HJfhiDz41Wxoqy7Pm3hbDVJaRMnA6geA== X-Google-Smtp-Source: ACHHUZ7Rq0QBeNag1H/4i0xala93hjqMQvfi+Vh95EvYzuG+5+0wT68jJfSTTbixlz76LOnFah12pw== X-Received: by 2002:adf:ef02:0:b0:314:77a:c2b2 with SMTP id e2-20020adfef02000000b00314077ac2b2mr2668100wro.32.1687961511401; Wed, 28 Jun 2023 07:11:51 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id a1-20020a5d4561000000b0030e5a63e2dbsm13529840wrc.80.2023.06.28.07.11.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 07:11:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Shiyang He Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix tunnel packet Tx descriptor' has been queued to stable release 20.11.9 Date: Wed, 28 Jun 2023 15:10:42 +0100 Message-Id: <20230628141046.2145871-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230628141046.2145871-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-63-luca.boccassi@gmail.com> <20230628141046.2145871-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/30/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/42d51b3d7c3939d20f9eb6ec5f060ad29c615bf0 Thanks. Luca Boccassi --- >From 42d51b3d7c3939d20f9eb6ec5f060ad29c615bf0 Mon Sep 17 00:00:00 2001 From: Shiyang He Date: Wed, 14 Jun 2023 09:59:03 +0000 Subject: [PATCH] net/i40e: fix tunnel packet Tx descriptor [ upstream commit e8b1a5dd7df3e7a3f87b469e1b007d560d46d7f2 ] 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: c59faf3fe8fe ("net/i40e: support TSO on tunneling packet") Signed-off-by: Shiyang He Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 071345da09..3b6c41c271 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -265,10 +265,7 @@ i40e_txd_enable_checksum(uint64_t ol_flags, union i40e_tx_offload tx_offload) { /* Set MACLEN */ - if (ol_flags & PKT_TX_TUNNEL_MASK) - *td_offset |= (tx_offload.outer_l2_len >> 1) - << I40E_TX_DESC_LENGTH_MACLEN_SHIFT; - else + if (!(ol_flags & PKT_TX_TUNNEL_MASK)) *td_offset |= (tx_offload.l2_len >> 1) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT; @@ -1131,9 +1128,12 @@ i40e_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 & PKT_TX_TUNNEL_MASK) + if (ol_flags & PKT_TX_TUNNEL_MASK) { + td_offset |= (tx_offload.outer_l2_len >> 1) + << I40E_TX_DESC_LENGTH_MACLEN_SHIFT; i40e_parse_tunneling_params(ol_flags, tx_offload, &cd_tunneling_params); + } /* Enable checksum offloading */ if (ol_flags & I40E_TX_CKSUM_OFFLOAD_MASK) i40e_txd_enable_checksum(ol_flags, &td_cmd, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-28 11:40:08.835285765 +0100 +++ 0018-net-i40e-fix-tunnel-packet-Tx-descriptor.patch 2023-06-28 11:40:08.084028083 +0100 @@ -1 +1 @@ -From e8b1a5dd7df3e7a3f87b469e1b007d560d46d7f2 Mon Sep 17 00:00:00 2001 +From 42d51b3d7c3939d20f9eb6ec5f060ad29c615bf0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e8b1a5dd7df3e7a3f87b469e1b007d560d46d7f2 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index fbbefb5015..b4f65b58fa 100644 +index 071345da09..3b6c41c271 100644 @@ -25 +26 @@ -@@ -304,10 +304,7 @@ i40e_txd_enable_checksum(uint64_t ol_flags, +@@ -265,10 +265,7 @@ i40e_txd_enable_checksum(uint64_t ol_flags, @@ -29 +30 @@ -- if (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) +- if (ol_flags & PKT_TX_TUNNEL_MASK) @@ -33 +34 @@ -+ if (!(ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)) ++ if (!(ol_flags & PKT_TX_TUNNEL_MASK)) @@ -37 +38 @@ -@@ -1171,9 +1168,12 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -1131,9 +1128,12 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) @@ -41,2 +42,2 @@ -- if (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) -+ if (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) { +- if (ol_flags & PKT_TX_TUNNEL_MASK) ++ if (ol_flags & PKT_TX_TUNNEL_MASK) {