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 9901846C54 for ; Wed, 30 Jul 2025 17:00:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 920F2402C3; Wed, 30 Jul 2025 17:00:51 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2079.outbound.protection.outlook.com [40.107.93.79]) by mails.dpdk.org (Postfix) with ESMTP id 555C5402C3 for ; Wed, 30 Jul 2025 17:00:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yZRDT50rPEHrVkzMHuU51TEZAj5gA290ky7mpmsQOTyhWw3XIWx1KWSOGpQaD8guUQK/aOkrjn4GfhE5DsnBpMCASC6btfOdQkti3Q0BvVCbzTfiM4W+Sw3dIIH8r3h3hRyAWlhqUDM12JWG9SkaNks8F8+/bgRzoim2taxeB56Sa8A3tUhcbSvNvbLMXcJdB9oCTmJQ4b+x6wCb3qEfm8tYA2kNW/ZlGXI39oMlS+F3DwfMKsPUMsmJw4G0L1HMHpE0ODcDdhl6gie/UAgPUoEWQfL5x5n1+hhiR+9Rt1OUJtperr7+Zkcn4CNieaNUxZzwpEjcU2n6rE3NBDXKbA== 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=zNieEfjgP8PLEwFIsG/Rl2EN38co9KPVMmHdA6wHrNk=; b=bgexrrrPRNXd+HdPLqgwr2rUJSdT0VB6av19DbbBWBBUe94GDHszmnATM0JqreDvNd9e4cF9zja1CKOjKOfbABR+AXmNEycyTscuStWRkmktjFbmyfuU8IUTPO08ag1NCj96STjSAczFVYtxAnMOMCTEQGu4WIWtz2/kIC6BgSk/bfiuYuWzgTBeLEBxtkMBpK9N3E3TpTyHJOta2bqbJcFCrjduDCqvqK6ouqKGwBiCRnSdtj9NJxzIinRogcnHc8TwyVjvFZXA/IxHkzJ2VfjcXVQcmbsSD267QPrzynX7j983YDfYlkhNjscf9KfMg0trIO3+4Zm/k99Zj97yyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=gmail.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=zNieEfjgP8PLEwFIsG/Rl2EN38co9KPVMmHdA6wHrNk=; b=JbrGuZeDoGxfCrnl2emnzm9SAAiEy+Hul5Cpu6gdgaUcb2X2T7+1NnA+6+/a8s8pYvAaVbiLsF/vzN0qmLHaLwWgY9HhD5Qaul+crFWIb494Xqvt+aUcHlxef90oKRrBmpwxwyeS3X3Gk52atmw8LlwXRAsQL37hNWzfxiTW7TIjF3QqZZ88AYbR/3SRvlXA6q1bAkqnt0XzCVST3PiPRtT3a+wcx6kJgJ353WyHT+kb5lsEcIRS77UTVWKMVACPTQBZfgnK8H8P5AN780/fCHVy8uFuS7VlTtdwyw2Qf1Pm9JiLvbDoZ3AD0agg0VLV4jOfjvofmZsnLrBB/gqIPA== Received: from SJ0PR05CA0022.namprd05.prod.outlook.com (2603:10b6:a03:33b::27) by BL1PR12MB5850.namprd12.prod.outlook.com (2603:10b6:208:395::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.13; Wed, 30 Jul 2025 15:00:46 +0000 Received: from SJ1PEPF00001CE4.namprd03.prod.outlook.com (2603:10b6:a03:33b:cafe::86) by SJ0PR05CA0022.outlook.office365.com (2603:10b6:a03:33b::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Wed, 30 Jul 2025 15:00:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF00001CE4.mail.protection.outlook.com (10.167.242.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 15:00:46 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 30 Jul 2025 08:00:21 -0700 Received: from nvidia.com (10.126.230.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.14; Wed, 30 Jul 2025 08:00:01 -0700 From: Xueming Li To: Hengqi Chen CC: Xueming Li , Baoyuan Li , "Maxime Coquelin" , dpdk stable Subject: patch 'net/virtio: fix check of threshold for Tx freeing' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 22:56:21 +0800 Message-ID: <20250730145633.245984-13-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730145633.245984-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730145633.245984-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE4:EE_|BL1PR12MB5850:EE_ X-MS-Office365-Filtering-Correlation-Id: 103af21c-09ca-4279-0ae8-08ddcf79dd03 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|82310400026|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mZsQLJsc98nIlq0B7IL1wlIOnBZhu1+5IpsErZ1ZkLlD5SNqrseSy+oqkw+f?= =?us-ascii?Q?EKcNOAF6rzY6mLht7enPUcmSBweA3lilWQj/JUbMEmdt69MLCrgZKg/CIkB2?= =?us-ascii?Q?f5zNKM0rKkUuxiayzJ4YB1J4W01OoyI3zO4YQXB92yEqviCEIwn2lfAEpRY0?= =?us-ascii?Q?TshVc7cuFKquLxRFNuC+C1nRnq2HMDH1yIHrsPc877tYg0MvM1iZs8mu4Gts?= =?us-ascii?Q?6t0+v+KYH+b91KYjZnDS2lhJ+OIH6OqQVu2JaI4c1wA3Mbp9BObVGoRl/EIw?= =?us-ascii?Q?rane04jeSTfkC/p72oj+28bxtfJDC2RBsw9SJhgjE5AyZ3tmUcUZRaI0u6jY?= =?us-ascii?Q?wZjFq8sKDWU+7l5dE1tlv23DA8E/2Ku18bJ8LozlAeXhWktFz0QqwHSRgOo7?= =?us-ascii?Q?qeaTFhpaTqn7bvm/vSvmN1gXft278qc2FyZgmqxeOqu1Du1j5gwsOgOTv1gh?= =?us-ascii?Q?3WlBZ5bPejGmliI88cAkuT1Ki2Gfyd2mvshHVYIJzLYsRJRjb6amAzi+ZV44?= =?us-ascii?Q?9Y3PIAhO9L5u/1Kh376N83dyCRpJAsUPs+KhH2BZZPJfmnxteDoaotwssBzX?= =?us-ascii?Q?KRJVVgWDwSD3aoNKN/+mN5GC6/K7QfuoiQiXjmNhkHoU4UPZVv/4J9VDeNoB?= =?us-ascii?Q?DPbkjPqqiTpUxHQxKRiVz6AhSZxHtALSl6MuaELkjC+mqJn4fSxdwOpPH3lk?= =?us-ascii?Q?ymBPSCJSjPz3XKU106L2gnAdQkM6aXRWPyrXPvh86GPWU8Nic9wUQVsJaOoM?= =?us-ascii?Q?4JwRVcbMJ6iSffVLLuW8YyJ/5KEBoKcnw7lvtdiMJFg/SFvYbJ1/EQ2g4Rmu?= =?us-ascii?Q?MCkTbytrbZjxfFJmG+PW2+t7aeEpHeh+oLCYuLeFUa/GYT36/Nv3eEy2sTh1?= =?us-ascii?Q?YmmY/Pzyjg/EcoOFjvUHgL0a6t5yo4GYsctbZ/avVROIL4n8DuNlJZPqMDdV?= =?us-ascii?Q?977jGsy6TB5YiSuDwKunozyP4gp9YDz9sA/FTAV9/BXJ9wrgjIoBtSJ5fvPB?= =?us-ascii?Q?iSyWmTWC+Vlfx8mGnuSL5jwKWbJbS46b5LbpM7dmI8KpqJpmYw0ao9pZODR2?= =?us-ascii?Q?8jhiGovtvopdtjAAyKRkMV8NIkaJeh7OTkWTslW6eGXaCRo9lI25HNpik2IZ?= =?us-ascii?Q?U8CRPg31nmd/ff1BHVGy9ylvRLFGM3/kVaFTUQKQVUmSHGePjmyJGvUeiYk+?= =?us-ascii?Q?TUsnHcPMvFS6CITk8ryYkEpvaT4VFnHKf6KBfQEkxSBgU5jCVFwkpey9iN7T?= =?us-ascii?Q?XvBjohuSF/PvKlGngid0tdiNOyHIH2Gmaj5sVHRU9Gk1o94X87GQYpm1VkI3?= =?us-ascii?Q?bQHKs37jxmpk36i5j0inaHu1JHyzVcxmTsokEun94nYr7FXVROv6ZNTOmrE/?= =?us-ascii?Q?GiskCkKfXLHrCBVpsxZJjsYSqLNjvFnNwY2nXb6PQLkNgSwqP7mKRQrAJXAk?= =?us-ascii?Q?ECIm+Rdh+ufFQl7jvLKHDjZr/pMrqIdDvUIv8+5gomoxyrkV69CLVisqkqay?= =?us-ascii?Q?/zNjKq0844Izeu6DLMOvL0Xc1FQ7AHRRkOAt?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(82310400026)(1800799024)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 15:00:46.1794 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 103af21c-09ca-4279-0ae8-08ddcf79dd03 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00001CE4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5850 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.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 08/10/25. 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=ebe1537ebc32a48f1ef31113cb13b8e0236360bd Thanks. Xueming Li --- >From ebe1537ebc32a48f1ef31113cb13b8e0236360bd Mon Sep 17 00:00:00 2001 From: Hengqi Chen Date: Mon, 9 Jun 2025 07:23:47 +0000 Subject: [PATCH] net/virtio: fix check of threshold for Tx freeing Cc: Xueming Li [ upstream commit 3e3c7f3fa5ac3f2748a4463d87e73eb28024b401 ] Like most drivers, make the fast path of virtio_xmit_cleanup() behave as described by the comments of rte_eth_txconf::tx_free_thresh ([0]): Start freeing Tx buffers if there are less free descriptors than this value. The rationale behind this change is that: * vq->vq_nentries is set during device probe with the queue size specified by vhost backend, this value does not reflect the real nb_tx_desc * the real available tx desc is set to vq->vq_free_cnt via the nb_tx_desc param of rte_eth_tx_queue_setup() API * so `nb_used > vq->vq_nentries - vq->vq_free_thresh` could never be true if say nb_tx_desc=2048, vq->vq_nentries=4096, vq->vq_free_thresh=32, see bug report 1716 ([1]) for details. [0]: https://github.com/DPDK/dpdk/commit/72514b5d5543 [1]: https://bugs.dpdk.org/show_bug.cgi?id=1716 Bugzilla ID: 1716 Fixes: 72514b5d5543 ("ethdev: fix check of threshold for Tx freeing") Cc: stable@dpdk.org Signed-off-by: Baoyuan Li Signed-off-by: Hengqi Chen Reviewed-by: Maxime Coquelin --- .mailmap | 2 ++ drivers/net/virtio/virtio_rxtx.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 80c6f855dc..86920fea08 100644 --- a/.mailmap +++ b/.mailmap @@ -158,6 +158,7 @@ Balakrishna Bhamidipati Balasubramanian Manoharan Balazs Nemeth Bao-Long Tran +Baoyuan Li Bar Neuman Barak Enat Barry Cao @@ -519,6 +520,7 @@ Hemant Agrawal Heng Ding Hengjian Zhang Heng Jiang +Hengqi Chen Heng Wang Henning Schild Henry Cai diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 99b95194cd..a13df4952d 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -1863,7 +1863,7 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) nb_used = virtqueue_nused(vq); - if (likely(nb_used > vq->vq_nentries - vq->vq_free_thresh)) + if (likely(vq->vq_free_cnt < vq->vq_free_thresh)) virtio_xmit_cleanup(vq, nb_used); for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 22:50:03.893233602 +0800 +++ 0012-net-virtio-fix-check-of-threshold-for-Tx-freeing.patch 2025-07-30 22:50:03.012754407 +0800 @@ -1 +1 @@ -From 3e3c7f3fa5ac3f2748a4463d87e73eb28024b401 Mon Sep 17 00:00:00 2001 +From ebe1537ebc32a48f1ef31113cb13b8e0236360bd Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3e3c7f3fa5ac3f2748a4463d87e73eb28024b401 ] @@ -37 +40 @@ -index 25a53d06ca..8e898e303e 100644 +index 80c6f855dc..86920fea08 100644 @@ -40 +43 @@ -@@ -167,6 +167,7 @@ Balakrishna Bhamidipati +@@ -158,6 +158,7 @@ Balakrishna Bhamidipati @@ -47,2 +50,2 @@ - Barbara Skobiej -@@ -552,6 +553,7 @@ Hemant Agrawal + Barry Cao +@@ -519,6 +520,7 @@ Hemant Agrawal @@ -57 +60 @@ -index edecd2011f..ab97f03d7d 100644 +index 99b95194cd..a13df4952d 100644 @@ -60 +63 @@ -@@ -1873,7 +1873,7 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -1863,7 +1863,7 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)