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 DDF1045CE3 for ; Mon, 11 Nov 2024 07:39:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC2E34067A; Mon, 11 Nov 2024 07:39:11 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2060.outbound.protection.outlook.com [40.107.243.60]) by mails.dpdk.org (Postfix) with ESMTP id 258414067A for ; Mon, 11 Nov 2024 07:39:10 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=l21t/uGARcZP5qIUqmI5Zt9Kihq3DT4Vt2IG6gju1yTviX6Rqm0bHRcktaAChgZGuAM71tANOGzABz/+ccokHvGuIszqVz+BO6wo45OEx/CALxX29R3LiIW3sAcv6cZZmKTKD8nADQAWp2MoT/DCWER/6lWjCJlnZcZ+jHzzYsYFmK39JfzpmpmpYpt0GtNqyfzHPb1kjF/JrgS+bgJHgHaBdxTxz5EsqIenCcGGbJ6YeKack+jaEa13q1vnYvifqv7wKJMLUZ4ozr1W4KFK2aa3o2DS4+KzmqVkXYSRzh0Kvzyl7O4CkxmWBWNt1tMWop/mOc0Z5sWzK47Afui3Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=47IC+A+JfAOz2jlbl6c+cbdVaKUh5KRStzX1vLWIUHQ=; b=erABic3O5AFM8hiNqZqoaOdAbZkeO92bQE+m3Er17DgvoOw+EmaG9TS4sfbtN0dI555/fDxvRa7fKHUYqOdZTAPLYTFOOEKF255OqxbExII2n4TzUPAjQ9oDAcd/O4F+bzCz4wX32e5cII201Xg6a2afnNNXL0RoyK1OOrVUfNRP9A1cxtdcVqisaEiC0GAJcJ/ACoTzCUTl0pq43kVF4xdiSlcpW1P7exr1p5GEpUchObM1QMMZLAoY7a+z1+Z98gKe7+g4P7D8f/Vroeb5mWl76iBA9iZ05Aor0SpAT3xY6l508SSNfOa8aGlGaS/ywj+sGRXFWuNzcAwYqRnIBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.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 (0) 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=47IC+A+JfAOz2jlbl6c+cbdVaKUh5KRStzX1vLWIUHQ=; b=Z5WheIYDZlbCAgCm1KYenngCDKOOAIC8W/+wUeh3NF7+ly7vY7nki0VX9vjaaEwlrqCJznpuTt4SgN9NfDX/xOmr5iR+J0/s3fBFjzGveZqUNHq8vxmtwnlQZdw39Ftn7fs19HCISBp/KrHRN9eyDo69gkq2v66zrlf/YX7ktcokLC9+Rq1doTl5SRR5LPpITCgo1mWpPlbkSMQ2C9r5LBnTM9Rph8rcxksho6QpaJ9iae6zS+/JKAB5o2YgXysLu2dZJAwXcXIozX/yRIY0yuBb3FhTwUuYw+BPSoR0o1Hg4qEDr6tDTWMySdK8rxWYBPtozquAni4BBLuxceHCUg== Received: from SN4PR0501CA0117.namprd05.prod.outlook.com (2603:10b6:803:42::34) by MN6PR12MB8469.namprd12.prod.outlook.com (2603:10b6:208:46e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.26; Mon, 11 Nov 2024 06:39:07 +0000 Received: from SN1PEPF0002636C.namprd02.prod.outlook.com (2603:10b6:803:42:cafe::2d) by SN4PR0501CA0117.outlook.office365.com (2603:10b6:803:42::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.12 via Frontend Transport; Mon, 11 Nov 2024 06:39:06 +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 SN1PEPF0002636C.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:39:05 +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.1544.4; Sun, 10 Nov 2024 22:38:55 -0800 Received: from nvidia.com (10.126.231.35) 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.1544.4; Sun, 10 Nov 2024 22:38:53 -0800 From: Xueming Li To: Chengwen Feng CC: , Ferruh Yigit , dpdk stable Subject: patch 'ethdev: verify queue ID in Tx done cleanup' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:22 +0800 Message-ID: <20241111062847.216344-97-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] 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: SN1PEPF0002636C:EE_|MN6PR12MB8469:EE_ X-MS-Office365-Filtering-Correlation-Id: 04d1f651-1c18-43cf-0a86-08dd021b89f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6eE5hT2pyG6T5RttsfQ670nJd/kFU6/IhAhadD6P+HEuyOC6VJ+cuRpTeZ9+?= =?us-ascii?Q?1jaIB75qW+14fF1bDXLCXUpMRR9GspjwnEWHvcb5z+LXLUMLS4guBAMQf7Vf?= =?us-ascii?Q?GECaniWrqFH/3ZclAEjSsZPY1SiDnHxRHONmbNdSx9QrqMCkIdFCPes1kQ2V?= =?us-ascii?Q?WxkhfHkRvfiwPJO8ug0dgjT71SZZbmZBTFIQ3rIVJcjynctAT5Ww7fh0zwKK?= =?us-ascii?Q?TM8N0iCPMN306sbzHXTnxMDIVfxE1UefhPv11GMOGeVNAbJJvXrqiNQ5EYG/?= =?us-ascii?Q?xUyJkdcW2aLyfXtHadgftOgnxrtADzoeI1JpmYEDZzcHkJt4HnSt/jmg5nRs?= =?us-ascii?Q?gWsi1Vbj/8pGIKKhd8tZ0NBbSuajRKwwqYEB2iyE+ITd+jAEU30acwmP/9MJ?= =?us-ascii?Q?+ByziW/xdScHQnxuwvF1f0F8DRMNJAkjxEtXS9fLUoh3lZeVHL6/G8761wZI?= =?us-ascii?Q?4ZlDBQZHBFDefJ3an0S5QHqalh/nYTewZHC3867gB3qyCp2Owy18vmjchlV4?= =?us-ascii?Q?ULoUPVAPJjyaoYFs39h0lWnCnEZa3aSmolP6d0NgjciVQ6ufOpADGkuMEa5b?= =?us-ascii?Q?x2SOKpandAl2fzekiN1HEPxPasCk4LlW5fsy0uyQIIt1eH62oXwN8tngz+Lc?= =?us-ascii?Q?5+Jn4HH00+gIW9S2PmVvVZqBKeC42QPq384GAhaWOz2WogNme9herCnoNON3?= =?us-ascii?Q?LAycBDnrjBydF/O1uJvJp11kl6iWDC7wc9YuphnOfKJ5VmNRGD8wxqCntBIU?= =?us-ascii?Q?YUlbUCtoi0HidIkxzIz5boAeodv9J+hjCYAv64AyLqn0ca+669KRAafwKqhd?= =?us-ascii?Q?b2c1jnO9w8Ln2PflonVEsj7zKIpWxMog3GQ4CE7UKJ8V7wEOi6p9fJ3bzQNU?= =?us-ascii?Q?zRIVFCvAYSYTcqCEetFzPNPJFMylxGGNYnRrM7XvhQ4DOhl4y6eH1/J3tY2U?= =?us-ascii?Q?LJv/7U3EYIJlmkzjzqHhGMcmdOoCPd2PyGrmv5bA5tIC7u6TXEHf6XWZg8g/?= =?us-ascii?Q?0aoW73sY+HK/m0zBsLH4t7PfLM/dPTlVhyGMgQuh1Cp0pqPt/oBsNb0hYZpj?= =?us-ascii?Q?5AywUlPv9zkuz9sGStvAtohGsvyzcNe9qR36MvLe8xS7EzC17kpqgnN6FiDq?= =?us-ascii?Q?gU1twn7iaLvSU8X2o5ycJpJKzwsH5fef8Bve6p8QfkyRSoIMoIlTki5yyYpb?= =?us-ascii?Q?XzBr16bcii2r8elWmxatk+oQvK1nlW+4FidpxA4gY4Zxyb2JOQTe1m6pk4rO?= =?us-ascii?Q?J3o6xp06u4pFA7jadK73ogjYAPtd6reU2lO2dGX0fGxx4RcHj/Sngn51LIeg?= =?us-ascii?Q?lo1JvxWzPvJyoVMu0mTMs/FeBLz8BW/5WnghVB4o1Hw523A60L0Wvp0rnw+B?= =?us-ascii?Q?YXX6UVhyBQDBHhX7Rgj1BtydFEZsCX8t4OwNjeWJQ+RyaOW6kA=3D=3D?= 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:(13230040)(36860700013)(82310400026)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:39:05.7491 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04d1f651-1c18-43cf-0a86-08dd021b89f8 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: SN1PEPF0002636C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8469 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 23.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 11/30/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=d745b41ff05ca149ab263e21423ceb87bf017d45 Thanks. Xueming Li --- >From d745b41ff05ca149ab263e21423ceb87bf017d45 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Sat, 12 Oct 2024 17:14:37 +0800 Subject: [PATCH] ethdev: verify queue ID in Tx done cleanup Cc: Xueming Li [ upstream commit 707f50cef003a89f8fc5170c2ca5aea808cf4297 ] Verify queue_id for rte_eth_tx_done_cleanup API. Fixes: 44a718c457b5 ("ethdev: add API to free consumed buffers in Tx ring") Signed-off-by: Chengwen Feng Reviewed-by: Ferruh Yigit --- lib/ethdev/rte_ethdev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 1f067873a9..dfcdf76fee 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -2823,6 +2823,12 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; +#ifdef RTE_ETHDEV_DEBUG_TX + ret = eth_dev_validate_tx_queue(dev, queue_id); + if (ret != 0) + return ret; +#endif + if (*dev->dev_ops->tx_done_cleanup == NULL) return -ENOTSUP; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:09.437338552 +0800 +++ 0096-ethdev-verify-queue-ID-in-Tx-done-cleanup.patch 2024-11-11 14:23:05.252192837 +0800 @@ -1 +1 @@ -From 707f50cef003a89f8fc5170c2ca5aea808cf4297 Mon Sep 17 00:00:00 2001 +From d745b41ff05ca149ab263e21423ceb87bf017d45 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 707f50cef003a89f8fc5170c2ca5aea808cf4297 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 12f42f1d68..6413c54e3b 100644 +index 1f067873a9..dfcdf76fee 100644 @@ -21 +23 @@ -@@ -2910,6 +2910,12 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) +@@ -2823,6 +2823,12 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt)