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 1103542ECF for ; Thu, 20 Jul 2023 17:30:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0D09240685; Thu, 20 Jul 2023 17:30:06 +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 87843400D6 for ; Thu, 20 Jul 2023 17:30:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867005; 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=WVPSKvVLU51qwhiZJv66Hp1TGD1xZj3EOZAKZ15Rz94=; b=KRYoAvytX1u2Ls9/dhhtJZOHkPtXcRUpjhCVDzoJ1VVBi1P6tWPMAlpgcUfzRk7k++8Ms+ FjyUlGH6Aw0oGnwTuq6yrSQfAIePM81oG9zUTrmekTzqhxAVwSRym4oxrYfnbz2wa10fKJ 57AEimOxjPNuLuN9Squ8x3lkPPu+G2c= Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-111-DLsRcFzCOi-tw7fBMdw50w-1; Thu, 20 Jul 2023 11:23:20 -0400 X-MC-Unique: DLsRcFzCOi-tw7fBMdw50w-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 3F96438035B1; Thu, 20 Jul 2023 15:22:35 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20E864A9004; Thu, 20 Jul 2023 15:22:33 +0000 (UTC) From: Kevin Traynor To: Shiyang He Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix tunnel packet Tx descriptor' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:53 +0100 Message-ID: <20230720151942.262154-102-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/ce8b351eafbc98183266efa850c9eb268e57daff Thanks. Kevin --- >From ce8b351eafbc98183266efa850c9eb268e57daff 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 aa188bff14..1c9e51fe2e 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -305,8 +305,5 @@ i40e_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) - << I40E_TX_DESC_LENGTH_MACLEN_SHIFT; - else + if (!(ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)) *td_offset |= (tx_offload.l2_len >> 1) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT; @@ -1172,7 +1169,10 @@ 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 & RTE_MBUF_F_TX_TUNNEL_MASK) + if (ol_flags & RTE_MBUF_F_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) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:07.563996182 +0100 +++ 0102-net-i40e-fix-tunnel-packet-Tx-descriptor.patch 2023-07-20 16:17:55.064752154 +0100 @@ -1 +1 @@ -From e8b1a5dd7df3e7a3f87b469e1b007d560d46d7f2 Mon Sep 17 00:00:00 2001 +From ce8b351eafbc98183266efa850c9eb268e57daff 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 aa188bff14..1c9e51fe2e 100644