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 002E74301E for ; Thu, 10 Aug 2023 01:54:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EAA9240DD8; Thu, 10 Aug 2023 01:54:03 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2049.outbound.protection.outlook.com [40.107.244.49]) by mails.dpdk.org (Postfix) with ESMTP id 7F094406B6 for ; Thu, 10 Aug 2023 01:54:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JuWXilGqLjd595HYDeOMY2GuTZ86btw9aN2eKLntS9Mk1oP511QBAF89nNgO3V7Del1wS2WdWXQywOv7Zi+thMu0FioVm8XAGilBKeKWdwwjREdaNMl6WNOAGogIodkQDJ0x+jAFK1VDv1k3Sur3E0lx1JPUMKWgVOQw4kNHqZC4KoiofRyFeWYsCKh6DcCmP1uBDK9633x5VaYYPd6kG3EHatf6wB31hQPQL5kNlGYxNmmW4WKXSces4wQQK1sRcVtQAPPeY5PrGLBNQabV9+I4Sr5VAQaYv2czLX+71saH7sWvZVkmpROwCxDg419jfRSvIAqStqkqAyM/UPB69g== 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=4Y5a9RgSojI04lFrqIuCtWbbwiyRe+Pmk0Chuq+zJSE=; b=TV5OqDHZ8GOuJ6+9ytNPfsA9gwy6ulw8lCf1KXL8rdU/FZbkquQ9Rlz1WWEKJroCEn3CTDwcpOFVnOhhQ9QKuw1SBRNfuBo5dmnLytMpSta75ez9Vm+uxNJYicOcikHRh5XIEZC7+KZ/FUh9RMeRZLZHquXGZH4BpQA8GnOdS8audeBEXkD1oEDFlqgOCAwGrpQuK26zopH+pY5Wb74KHmCMJCuYFJyZvt8qs5piI4mhtRAP40cjPM3W3v1Hd8yhDSTwGQRLCXPpCmZeqqwIDvowNAWITXUwTqC/nMJfSavVdTGTOwwid0uq4f2h/+GEJUn9Va37wCkQymy1VnyGbg== 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=4Y5a9RgSojI04lFrqIuCtWbbwiyRe+Pmk0Chuq+zJSE=; b=tu5N/rn3FJgpFpzCiatCw3mz2PHTOwcodBm5xEvVTFepWS2i8Oi7mPTKKNjYH84HfVpuoABFkxsSHgD3HC6lMyhXuHEpOYJN6z8CE4VyErEdxdp1VefbffoFNGymt+KR7MRTusfrgYAO/ouVWLsBpOM+nFr42zy+ZK+ARcRWet4hln6nskFJKNP0GLaVuvQoQbGS3DOLHyYgdt043Hu0rVkoQqKFON3K9fheYIJVQP1wR+cMFev2HnW8w0WYM9SwimWG8NT+amaH1qkS10IvaquF96WZIY49ygNRBuqzJyo3sLPMnP2VN3GSIAxGy2J0rjaB+G4g+7gh/5K/fk5VWA== Received: from SN7P220CA0025.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::30) by MN6PR12MB8489.namprd12.prod.outlook.com (2603:10b6:208:474::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Wed, 9 Aug 2023 23:53:59 +0000 Received: from SA2PEPF000015C9.namprd03.prod.outlook.com (2603:10b6:806:123:cafe::85) by SN7P220CA0025.outlook.office365.com (2603:10b6:806:123::30) 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:59 +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 SA2PEPF000015C9.mail.protection.outlook.com (10.167.241.199) 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:59 +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:46 -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:44 -0700 From: Xueming Li To: Shiyang He CC: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix tunnel packet Tx descriptor' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:48:02 +0800 Message-ID: <20230809234930.32424-41-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: SA2PEPF000015C9:EE_|MN6PR12MB8489:EE_ X-MS-Office365-Filtering-Correlation-Id: 27083326-2665-4b51-3d4c-08db9933e678 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UpuwgUaYuqkN7W5d0UMzsyYPpGvdbcizHb2JASDyl4SwvP1qrWFwz/+ztL9JRpF7vS+aW+JILX9Kiik3GfeaRId9drC5Eis2SCUDmNetjk7nno1wkga8824BEUGa0GLmAmkvMBUGW3J4myRgQ3TQEnI6DOI+OG1SRPE9J4QKos6njlCnWDXq1G1ETDFoSXFUY8LduTKCK++YGf2GJffIj10ko6pnPw7lxXOzsvywCw2NmPRIXNXStDcM8rid+tYNwxqKe47rykB+klyXXuC1XObHTvmUxrtdkNlvRkbNcZXXX9ReUxIN7fWylKuwDd5WQoT/fDbfonp/5VVHSq81gVjKH9gdUK9xRNNfVy9/eKgvEjk5VE8Xaszt8OzXEaQ9UGL9DvhtWZU1FdbMgELT+u8R5KzDgYM1BmjozSvw6G9YbfDzt91vXFXnTe+Scci2gPzGg5fXOKp00tu2yM4pvmtWr07OEBO7eAkkTDUnX2jMo/Ok/mShZT3UFy9SS4PWhkA/GIntuSxu6JgqBrMLMQnT/8GDwFwccwOJKcn/uyzjOCjVOsxO8SRdixnEFyF7WqzeQWy7tw/xTW18CeoenP8m5772oUmqf44eMH08T79j4aICZ4pQFLGizlr64UnnaOLLj3uEE/0+xnMZ+J2sqhzrJmL/Rbq1HTYBEx2gQVTvqg7jlHCzgU3mBJJ5tzCr739w4i2VqgiOm1wSxK1YIFMXz2kU1eAchwvS+lGvVUuqlNXsUKStJJ0Aw5aezavwp4NWN/lN0Ze70XLIGzb+iw== 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)(376002)(136003)(396003)(346002)(39860400002)(82310400008)(1800799006)(451199021)(186006)(40470700004)(36840700001)(46966006)(86362001)(16526019)(7636003)(40480700001)(41300700001)(336012)(6286002)(53546011)(478600001)(8936002)(40460700003)(8676002)(26005)(1076003)(2616005)(7696005)(6666004)(426003)(5660300002)(83380400001)(47076005)(2906002)(36756003)(36860700001)(54906003)(55016003)(6916009)(316002)(70586007)(966005)(356005)(70206006)(82740400003)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:53:59.0672 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27083326-2665-4b51-3d4c-08db9933e678 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: SA2PEPF000015C9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8489 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=4f26624221580dd54a60e3cff98003be7dd630b2 Thanks. Xueming Li --- >From 4f26624221580dd54a60e3cff98003be7dd630b2 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 Cc: Xueming Li [ 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 fbbefb5015..b4f65b58fa 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -304,10 +304,7 @@ i40e_txd_enable_checksum(uint64_t ol_flags, union i40e_tx_offload tx_offload) { /* 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; @@ -1171,9 +1168,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 & 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) i40e_txd_enable_checksum(ol_flags, &td_cmd, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.278109200 +0800 +++ 0040-net-i40e-fix-tunnel-packet-Tx-descriptor.patch 2023-08-09 21:51:18.174352000 +0800 @@ -1 +1 @@ -From e8b1a5dd7df3e7a3f87b469e1b007d560d46d7f2 Mon Sep 17 00:00:00 2001 +From 4f26624221580dd54a60e3cff98003be7dd630b2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e8b1a5dd7df3e7a3f87b469e1b007d560d46d7f2 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org