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 488D84301E for ; Thu, 10 Aug 2023 01:53:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41BF640DD8; Thu, 10 Aug 2023 01:53:37 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 9A127406B6 for ; Thu, 10 Aug 2023 01:53:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B6FOj52MwBX9SIV5EHaPD7ZDr8Msn5RSUAJhfz5fhOfPCRZHj3bdC4YJUC9WiApuYkwxQYMcwOZk5l+ogc0Bfq39Dvf2348XtuPOnU06/NoR0QFqGFJKxWBZQ+OBX5TxDxQ0gk/4BtvvYN7xklAn/hvW7VSpCgq+0NrIln+JzpT2llMVHfvXH+LAUw4v/vsKJPUfkMYCpmETZ2ReKXPwk+TWMh9jY9MkZqxBBdOU6rUsegBdw2xzAiZqg7ztr8Zfu93lEBdV713NjpIG3qThJjms1U57Ya0bOkibAwEWcUfj+m2GNOiS263+IwEmCFyLOHbWjtt0gYOgWWOMWlzRXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=THfawcNhZPBBUXebr0IK+h3AZyylZiWuW03bq2YRzbo=; b=mz+5Tske0bkGqJjeePS5e3MWpZW36C/Hr6Jl2sqZ85/PEJvb/LA7s8Hg4egyO+2UNcI4gaRWHm2uFmia0VwatMwgj5iY6ygmi1jzU/NnMvyw2vVVCsgesX0CSK+dryWKLgvxI9W5R86eBRn1NdFZCp2OfCBc16+YuP/svEHJVvfJTn78c0XWx/x5E3fwke81/R9XnRiAn7Yd8/7iqGcW5kOSNGjQnwLsU3iNxp0zL1IptSGFAiLL5zr4Y2V++xtWpdiOIQNS78C9n19+YRja8xeOK/TxpCXvZYSjFAv40DM0gi/T8TgmjOASLy5PesYNRONx4I9lgCyT3+v0RRVwiQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=THfawcNhZPBBUXebr0IK+h3AZyylZiWuW03bq2YRzbo=; b=Tcoa442w0Ku/Bffi+YKnJq8r5T85kTbM6c7pCJQTMWPxsGkMe3gMMxM/EcKMmZKRSffqXnwZvpXpZbSHDMRo/trKpx7XKxNofaRZB2DH/06HyvotNXNbu/B9iuSrbKphNfKw2fJUR2W3LcDvEbOLwwLKBRI8NKfXiQpr5SPeE5jPComCIm2wd2HExq0g+IWZJurIVE9U8ICcFiySeQQ3QEEZhbDl2CZUXXgkj50lPehcnxoHIwoJTzQ2Rj5mC4k9O4ajDoNZ/D7vC7yXeesN1ueavVU7fc0Ed1U4ne8cehOz9tHGObFzCtfwaaOksXoUBBc3VQA4YaNwnJ/OkzEDUg== Received: from SN7PR04CA0209.namprd04.prod.outlook.com (2603:10b6:806:126::34) by DS0PR12MB9447.namprd12.prod.outlook.com (2603:10b6:8:1b4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:53:34 +0000 Received: from SA2PEPF000015CA.namprd03.prod.outlook.com (2603:10b6:806:126:cafe::25) by SN7PR04CA0209.outlook.office365.com (2603:10b6:806:126::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:53:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF000015CA.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.20 via Frontend Transport; Wed, 9 Aug 2023 23:53:33 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 16:53:19 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Wed, 9 Aug 2023 16:53:17 -0700 From: Xueming Li To: Shiyang He CC: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix tunnel packet Tx descriptor' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:58 +0800 Message-ID: <20230809234930.32424-37-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015CA:EE_|DS0PR12MB9447:EE_ X-MS-Office365-Filtering-Correlation-Id: ac44f2de-0378-49fd-fc81-08db9933d761 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1q2Ue668aTd1iRcZZWLTCunht8EKtqxmCAGahOC7EpY2tK9Uqfw3neKK7C0OyC30QivqpO7P/3WymBEZlc9S1Aui7MUifn+zngLXtAyLkW69Qze0XHPQw0fmT7la5ypUAxc85HjTze3Bfuirv+pjMSxzXDet8V8WWM5X5YWPzZ8AONP4kPJKIHEwkB6lSP6qntj68mqMcCEOyNug56ky7OxrfAIXRypzt9TaaHLUaUS9dffgfZnux3nNPHt3TH8ZNVJ//0nQL5QtRnEs8kU28SZlz41eNJhSAKJt44eMEtGP5qvnNpI1gB2vkkZaxiYeOJNHsaYJewgvqAE334CYMCBOmdrSJz7F8LnRxuBU3d0wnQ0FmpoW2B6aXrt2Xo8k5p3UVbytoBPXMCa0xdeK1Xc8alj67Zb7X148x92C6WhogU0MN1WCv/r9YrMrqZKIcYSO500D7zmxzWCe9Znt6OGXIqrlBI84ti9Kwr64b31Xi39K4FA9u3u/TQB6PKMgecuKv0FqgXQj0+SkNOCA3N36QTKH5Fv3rXS0vkr+ITxQyzHeO6kfRkVPBB9AKZBgVXEP7R/ukhjW7R0MgDZHy99k80dGmmb8GD7t1UnWDKxsxOvDdEf3/55AlOrnHjpNPn32OWEj5rsuJ8DY1GdbcbF/kg7ooJMXUr1C2Iy5Sw9GwsMshM52dTCFEJKgPaT+QBhX+KreojnBCyzsVH/t7ULwRQQ0yKR3j+BTtAEucWfpz9Fj6RJR1U/VpdxDNRUs1b+h1/4HlBp5fgsaL0f2Fg== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(376002)(39860400002)(346002)(82310400008)(451199021)(1800799006)(186006)(40470700004)(46966006)(36840700001)(478600001)(4326008)(6916009)(316002)(54906003)(40480700001)(5660300002)(40460700003)(41300700001)(8936002)(36860700001)(1076003)(26005)(36756003)(966005)(70586007)(70206006)(86362001)(6666004)(8676002)(7696005)(55016003)(2906002)(7636003)(82740400003)(356005)(336012)(2616005)(6286002)(16526019)(83380400001)(47076005)(426003)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:53:33.7555 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac44f2de-0378-49fd-fc81-08db9933d761 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015CA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9447 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c8b6f57dc4476ffbada1d3051c2c57680ca1018f Thanks. Xueming Li --- >From c8b6f57dc4476ffbada1d3051c2c57680ca1018f 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 Cc: Xueming Li [ 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 665ae32c13..598edb29c9 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2746,10 +2746,7 @@ ice_txd_enable_checksum(uint64_t ol_flags, union ice_tx_offload tx_offload) { /* 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; @@ -3010,9 +3007,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 & 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 */ if (ol_flags & ICE_TX_CKSUM_OFFLOAD_MASK) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.170286300 +0800 +++ 0036-net-ice-fix-tunnel-packet-Tx-descriptor.patch 2023-08-09 21:51:18.164352000 +0800 @@ -1 +1 @@ -From c261e7de45d38ddc3b4b8909c35b448c5e1b0fcf Mon Sep 17 00:00:00 2001 +From c8b6f57dc4476ffbada1d3051c2c57680ca1018f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c261e7de45d38ddc3b4b8909c35b448c5e1b0fcf ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org