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 0B2A641D8D for ; Mon, 27 Feb 2023 08:11:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0225240A84; Mon, 27 Feb 2023 08:11:18 +0100 (CET) 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 B991040A7D for ; Mon, 27 Feb 2023 08:11:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jQB2sutQ0hBKixizfJ1r7F0DTrZ2EdJfGMnALpZKtZ2YNKUGIA11Uzfeznp6hbIFJWr+AQKhQr9RvwFX8R1nHbfRCxxVvgxn2zs9KomCHPLmX/752PBf6d4/Dun57yJmoHHkDsGl2Xe12p5vUnyZikm6ZraqH0NCZL+mCIijf3ooKyPZrTq0ccPmqwFwy4b5ZfaPTG/0aSe4cYBwXl4OwVTOGm3kOVb6/wWatvCOyiLE7NOFSf0Z7XYbTWsaTWpDKW/Vjng9mrT5pz2iMqbtXWcueboNilKsTboLwpOOv8eCFWvEGqZgPKobZcOIVMvFoiBF2//lOgigf85b0++bjQ== 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=TFmA8QFnii4CcG64pA4juM5XBPJfktF2qQnk2/Bdet4=; b=mjDXj4qB/OVJjMXNd5j7MrG0JRYsDkakztNd09i6om0fSeeyL2aEQkcB9vb+lD9YXt/RjovT6x3Cx1/iK4u59UvFkutR9slgpxFeKwLQsMcEYJZ2X6X5ItFGNtYz1mCrx/cuJt6jSgyuTqHbIa7MkQeGBjInSJzJ2wJGoNhJ8SJ3QcRkAByY6qtSNQdN6MvTpbWuHItYKwqAr4FooRZkuWIg4mDAH9BSpgYqbyl0XhBv0RwUjVePscT2ZaQ8+aEQP7XYwny8B3Vgi7UKSnzTjDQZASqULu06JtLHxJVO5BudomuKEvX4vb21cKqRl+o5v3+TbjJD7OtJkYisKBQTHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=trustnetic.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=TFmA8QFnii4CcG64pA4juM5XBPJfktF2qQnk2/Bdet4=; b=dfZ9pamiP7+ZzJTB69XL66ufsyLT4a1P/eVMHhY6VToMoYSRDwpCTOh+IsVBL09Oyzjtn/nsq/wSgmU1Ph4DR7fr9CBCjPyRiWQwWPwPTB9iEh64gImY7O3TuLnpSUrB+A8/wlUj+ebLF15E8j8GD2k+2DbH+XQzMXxbxiUgqRmIAbPzovH9IGGfgbuwOVvC7pO7OvdxOpMyEnZQKdTgq1rj0Hm3exn1s9XQ9LV0BmkT/ndt+sXWWvoTdbDfbAOV5IvTyCYKCM+vZsEj11Iucb9DxVP9w5iXqMyLcyICz+/d/5pKJLfxj0Tzz9XuoMVSTDoyYe0zwy2B36pc1Li+/A== Received: from DM6PR14CA0046.namprd14.prod.outlook.com (2603:10b6:5:18f::23) by IA0PR12MB7531.namprd12.prod.outlook.com (2603:10b6:208:43f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.27; Mon, 27 Feb 2023 07:11:14 +0000 Received: from DM6NAM11FT106.eop-nam11.prod.protection.outlook.com (2603:10b6:5:18f:cafe::cb) by DM6PR14CA0046.outlook.office365.com (2603:10b6:5:18f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.28 via Frontend Transport; Mon, 27 Feb 2023 07:11:14 +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 DM6NAM11FT106.mail.protection.outlook.com (10.13.172.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:11:14 +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.36; Sun, 26 Feb 2023 23:11:06 -0800 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; Sun, 26 Feb 2023 23:11:04 -0800 From: Xueming Li To: Jiawen Wu CC: dpdk stable Subject: patch 'net/txgbe: fix packet type to parse from offload flags' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:00 +0800 Message-ID: <20230227070107.15664-92-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-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: DM6NAM11FT106:EE_|IA0PR12MB7531:EE_ X-MS-Office365-Filtering-Correlation-Id: 27bb45e4-d9d3-4d8e-d9a5-08db1891d032 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LC541xiDzmQTQMMFgt6ybU8xnRPfyS+XjAsXNq4k+88uBOwJTURA/nM+2eWbkhs1byDaR5cgfFq1vQ34Juige4wCIzczngkOxG0gGWC+78VXOqZ+BnNmRuEgUIgs4UC+P7U294nCC+BRf8KPtUobZxXo8D7OqkRzuVKWvPYOKe8be7YlUgr1epjkoSh4Ajnfc7YKvujgx4pPSRfom4EC9SwLcPD8+ZkcXlFMYzKMcHtkdYWlv/ID0xCYopHzOcscTJlps7NW9NUxQnI9JbY21aysvxOOiCyM3kqxkGxZmMEUkDeLRxKVUHl+UBrwRhgTpHzmdCoSfdlbTcyBMcmMHae9rjPyqZjaYPhcJFp2kelCxXlKnrXtk7cfNsyI/Pb5z39gTdLzpC7uOIfldPs8uP4PNwrzBhVEmWjbAEpbnyo2Z8CXJVJavsp+2Z9+TszSTcL6d0peIjsTVoPVCZpbNzKuC6RzRXCiDttF0c3BIp+zTiptvRnrs7beLIueCm69dQ/+22SBx/Yfy74uKolUyzdsPrD0lrZ+kKx4cVHgTOCT8UEY36GY9iLLC6Wmi8aVQGQ3c3vGETEGKrcQzL1mDeUqvzmwzfiBPKLE4pLqN++XuE1PoC7BR5evz4izfvN/PMZy6tFMYjP7yS32FuUc6mvh8pcmDa2Ixf6jLeQiQ6hS++9yfPf8sOEACoWybm5ERaYetZfS8/JuajqhyOf32YuZ3xhTNkTyJQmuwzRmTTE6xvs3h2sV8V30MH47K9LVmQhMSEl7Eck/1GEmzx6CMduqJwyV3Z14HCf7bIG5kr0eeIKKVhwqUAMtCx0boJ89 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:(13230025)(4636009)(346002)(376002)(396003)(39860400002)(136003)(451199018)(40470700004)(36840700001)(46966006)(70206006)(70586007)(6916009)(4326008)(83380400001)(34020700004)(41300700001)(47076005)(36860700001)(426003)(82740400003)(336012)(316002)(6286002)(36756003)(16526019)(8676002)(7636003)(8936002)(5660300002)(356005)(7696005)(86362001)(2906002)(966005)(478600001)(53546011)(26005)(186003)(40460700003)(82310400005)(55016003)(40480700001)(2616005)(1076003)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:11:14.3812 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27bb45e4-d9d3-4d8e-d9a5-08db1891d032 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: DM6NAM11FT106.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7531 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/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=c96c4e1b9e4058e655db4b3d5849ffbcfe6f249a Thanks. Xueming Li --- >From c96c4e1b9e4058e655db4b3d5849ffbcfe6f249a Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Thu, 2 Feb 2023 17:21:26 +0800 Subject: [PATCH] net/txgbe: fix packet type to parse from offload flags Cc: Xueming Li [ upstream commit 0e32d6edd47914d38857c34d97416b9c91929020 ] Context descriptors which contains the length of each packet layer and the packet type are needed when Tx checksum offload or TSO is on. If the packet type and length do not strictly match, it will cause Tx ring hang. In some external applications, developers may fill in wrong packet_type in rte_mbuf for Tx path. For example, they encap/decap the packets but did not refill the packet_type. To prevent this, change it to parse from ol_flags. Fixes: ca46fcd753b1 ("net/txgbe: support Tx with hardware offload") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_rxtx.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c index ac1bba08a3..021f281fbb 100644 --- a/drivers/net/txgbe/txgbe_rxtx.c +++ b/drivers/net/txgbe/txgbe_rxtx.c @@ -516,20 +516,21 @@ tx_desc_ol_flags_to_cmdtype(uint64_t ol_flags) return cmdtype; } -static inline uint8_t -tx_desc_ol_flags_to_ptid(uint64_t oflags, uint32_t ptype) +static inline uint32_t +tx_desc_ol_flags_to_ptype(uint64_t oflags) { + uint32_t ptype; bool tun; - if (ptype) - return txgbe_encode_ptype(ptype); - /* Only support flags in TXGBE_TX_OFFLOAD_MASK */ tun = !!(oflags & RTE_MBUF_F_TX_TUNNEL_MASK); /* L2 level */ ptype = RTE_PTYPE_L2_ETHER; if (oflags & RTE_MBUF_F_TX_VLAN) + ptype |= (tun ? RTE_PTYPE_INNER_L2_ETHER_VLAN : RTE_PTYPE_L2_ETHER_VLAN); + + if (oflags & RTE_MBUF_F_TX_QINQ) /* tunnel + QINQ is not supported */ ptype |= RTE_PTYPE_L2_ETHER_VLAN; /* L3 level */ @@ -587,6 +588,16 @@ tx_desc_ol_flags_to_ptid(uint64_t oflags, uint32_t ptype) break; } + return ptype; +} + +static inline uint8_t +tx_desc_ol_flags_to_ptid(uint64_t oflags) +{ + uint32_t ptype; + + ptype = tx_desc_ol_flags_to_ptype(oflags); + return txgbe_encode_ptype(ptype); } @@ -776,8 +787,7 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, /* If hardware offload required */ tx_ol_req = ol_flags & TXGBE_TX_OFFLOAD_MASK; if (tx_ol_req) { - tx_offload.ptid = tx_desc_ol_flags_to_ptid(tx_ol_req, - tx_pkt->packet_type); + tx_offload.ptid = tx_desc_ol_flags_to_ptid(tx_ol_req); if (tx_offload.ptid & TXGBE_PTID_PKT_TUN) tx_offload.ptid |= txgbe_parse_tun_ptid(tx_pkt); tx_offload.l2_len = tx_pkt->l2_len; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:43.865873500 +0800 +++ 0093-net-txgbe-fix-packet-type-to-parse-from-offload-flag.patch 2023-02-27 14:08:40.819237000 +0800 @@ -1 +1 @@ -From 0e32d6edd47914d38857c34d97416b9c91929020 Mon Sep 17 00:00:00 2001 +From c96c4e1b9e4058e655db4b3d5849ffbcfe6f249a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0e32d6edd47914d38857c34d97416b9c91929020 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org