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 6AA0542D83 for ; Wed, 28 Jun 2023 16:11:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 660E0410F6; Wed, 28 Jun 2023 16:11:41 +0200 (CEST) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 442C142D17 for ; Wed, 28 Jun 2023 16:11:38 +0200 (CEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3fa99f6a482so35931535e9.0 for ; Wed, 28 Jun 2023 07:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687961498; x=1690553498; 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=SRgPIWdSzonlSjm0KJuGFoKd78qOKUcUjFV2lZL0cJ8=; b=cYDzpYfAHh6J/2jVsSFvMXhHV/+E3jJGe9FCIT5eELkwqYxvFr+dPjejvuhK3Vda3d zjKdBW7ja+YlRFPbsEiUJ2ynof6pwxvfRcACphTPDJsNhfQb9IgzTLJCGRyCim5cVmj6 5c/6yeenwqJMiZq7C+wrFYpCWEDdAKgjhlCVoj3DLm0imKbNb1oHwC0fIwKe/L44Z6DL LL8iqDnMOy+W3RgxZhzYC1b0024dWW/dOnSiUBI7vo9FV55odjw/FvgmmGSZjnA25giK 1GXyzNKbsxjLvvDT3d3DhR/94nPqeujJJTgg/rFnhR7YpbnWlK23Vd6n20/AioH3ANaY E4Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687961498; x=1690553498; 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=SRgPIWdSzonlSjm0KJuGFoKd78qOKUcUjFV2lZL0cJ8=; b=KjF62DtM4JpW+QX1cTqGjEI0FWBx9I/gn8YNSsOL7KM1ua5cMq68kQfideqX6hx/St Sw72oMrxmG7gdWsm+DGB0MmwAm7JtjmNUQ4x+GoJDpeDVJv2vkpAN9FdTOug34qqOTFD QnSuSwkpuksR7ukWxLyLiuirMVuMFFZurZlq4kh9DBjonoVV4ryutE7fFvdfNSXzdtqg mf+csePlM8sQgrVHYTD2uSKOoDfWg+fFv32vN/5b1Nx7WNhLWxQH2ooS0YzNvi55OgP1 i6f8+sas5pHSOOtxFA2rjJJnc8PoiDhDqKsTSgjTyGLllzy67+DKjkbNHNYSn5j1KB2X J/QA== X-Gm-Message-State: AC+VfDxvSsgpISTaqFWFg2Ij+tE3SUxFjLxv69ffR2LY4FCep1WoO+nG 6h4zQiwtmgVQ4c97EkresQJ606wuo/FgQA== X-Google-Smtp-Source: ACHHUZ4moriI7cDLb0QMzTq8nbHqaid/CNqXarWHf5TtPeRXFd0cYFisW5DZxxpR1wqegjlLJe/swQ== X-Received: by 2002:a05:600c:2205:b0:3fa:8866:14af with SMTP id z5-20020a05600c220500b003fa886614afmr9258217wml.14.1687961497862; Wed, 28 Jun 2023 07:11:37 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id q20-20020a1cf314000000b003f90b9b2c31sm17099458wmq.28.2023.06.28.07.11.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 07:11:37 -0700 (PDT) From: luca.boccassi@gmail.com To: Shiyang He Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix tunnel packet Tx descriptor' has been queued to stable release 20.11.9 Date: Wed, 28 Jun 2023 15:10:39 +0100 Message-Id: <20230628141046.2145871-15-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/92fa658fa83583ed932032615251f92c298d34e6 Thanks. Luca Boccassi --- >From 92fa658fa83583ed932032615251f92c298d34e6 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 87cb7e8e8d..bd8811649a 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2356,10 +2356,7 @@ ice_txd_enable_checksum(uint64_t ol_flags, union ice_tx_offload tx_offload) { /* Set MACLEN */ - if (ol_flags & PKT_TX_TUNNEL_MASK) - *td_offset |= (tx_offload.outer_l2_len >> 1) - << ICE_TX_DESC_LEN_MACLEN_S; - else + if (!(ol_flags & PKT_TX_TUNNEL_MASK)) *td_offset |= (tx_offload.l2_len >> 1) << ICE_TX_DESC_LEN_MACLEN_S; @@ -2619,9 +2616,12 @@ 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 & PKT_TX_TUNNEL_MASK) + if (ol_flags & PKT_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 */ if (ol_flags & ICE_TX_CKSUM_OFFLOAD_MASK) -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-28 11:40:08.706811783 +0100 +++ 0015-net-ice-fix-tunnel-packet-Tx-descriptor.patch 2023-06-28 11:40:08.072027835 +0100 @@ -1 +1 @@ -From c261e7de45d38ddc3b4b8909c35b448c5e1b0fcf Mon Sep 17 00:00:00 2001 +From 92fa658fa83583ed932032615251f92c298d34e6 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 87cb7e8e8d..bd8811649a 100644 @@ -25 +26 @@ -@@ -2746,10 +2746,7 @@ ice_txd_enable_checksum(uint64_t ol_flags, +@@ -2356,10 +2356,7 @@ ice_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 @@ -@@ -3010,9 +3007,12 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -2619,9 +2616,12 @@ ice_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) {