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 E3B8146A63 for ; Thu, 26 Jun 2025 14:03:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DDDEC400D6; Thu, 26 Jun 2025 14:03:41 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2070.outbound.protection.outlook.com [40.107.93.70]) by mails.dpdk.org (Postfix) with ESMTP id F32A1400D6 for ; Thu, 26 Jun 2025 14:03:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=odOiBICddbBIEUUJ7dZ7EMhklWh9Rdt7oEOP90KGorsH5UpP/a6CDj1svTXok+zVb9fy53wU3c96bi/jOazT4ZoeGd+FnSuAvMgxr+Vcciw7ieKwPMzfbnpsnabnYgy1Fq4qmM8yWZXXuUDH8ef6nQ2yi9WDYsnf2U919i5acPuoENudGjLOD7IB5FLouu5/eidHAr/hjGXS114kBYO94aDVj+2d5+xGA67hvnR5k7g6e4AFnrMq4xxoS/HIZaoG21zjuyZQspHd3vysjLmvCAgYj97Qbb4JSfIz4pf3pQ9BZPBxRB8Was7IYSHHkDnAE63J8xUJUNoB3sF3BaCEhQ== 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=Tw3g4DKFJAFIyD3dquHcz4ZlwNkyn46WxwSVpakxVS4=; b=RA0lfR5U6V7xPm/QdgAsMobJUCiipcR01zeAnLPubg1EaIBCQ5ZKZTMOIvWCZH1KB0pFcSsbk+MZlXjOGHPXjaluBOStbcu9B14JngRq4SFLl4PSrNO9ACBPAY+qXmYAgx91OkiX2XxPoKlMfYS0RvwBaQ6DcOrIjT1pFvtZG7r34FHyfr38esg/ahBvvaP408+zMO++9or6wnmbk6fXhrNL7IQWBbRZtcFJUDlxoUjzNdpQL4YuNuFC9eY08O1lB23EQM4oR3rZJRHGjn1yooaMgrXm06evk3sZhtZOjX9lp4XfBuG6pKwYib5761dFqhRsVXpNvpzi7Mhc1og7pg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=redhat.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=Tw3g4DKFJAFIyD3dquHcz4ZlwNkyn46WxwSVpakxVS4=; b=I1aihu1OGzY5zUZE1oFXxD/d9mxbNCVg8xMC09Tlve9Dkdh0k9DcxqCoeyXWkwZOZzW5xFsng7HxATE0+39eDwsunm63UOr/04JeOx8zS+4iHJZlumm8lwL4oWU+pwUxwOg74SFecnqQR7MvSwdxHS6C/liIqz86ux+oxEEQzaLkXqHFJutUl07lsqaWKI0/tUY7t6tBfvZaAqreNV5bSQiKmXAKvjEbcJfUYqKORlvMTnzU1l4jMLlDHPPgb6jRzx1J2nAIV/Jn7PQwJP62QpCXIuoDfY3MZ0h/OYuASywxdXOr7n3yUNMhQcViEe5ijbO98gqP5LUfIx0JcmZGhA== Received: from BL1PR13CA0293.namprd13.prod.outlook.com (2603:10b6:208:2bc::28) by SJ1PR12MB6098.namprd12.prod.outlook.com (2603:10b6:a03:45f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.29; Thu, 26 Jun 2025 12:03:37 +0000 Received: from MN1PEPF0000F0E2.namprd04.prod.outlook.com (2603:10b6:208:2bc:cafe::8f) by BL1PR13CA0293.outlook.office365.com (2603:10b6:208:2bc::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.9 via Frontend Transport; Thu, 26 Jun 2025 12:03:36 +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 MN1PEPF0000F0E2.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:03:36 +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.4; Thu, 26 Jun 2025 05:03:18 -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; Thu, 26 Jun 2025 05:03:16 -0700 From: Xueming Li To: David Marchand CC: Xueming Li , Maxime Coquelin , dpdk stable Subject: patch 'vhost: fix wrapping on control virtqueue rings' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:00:35 +0800 Message-ID: <20250626120145.27369-16-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E2:EE_|SJ1PR12MB6098:EE_ X-MS-Office365-Filtering-Correlation-Id: acf79446-c450-4850-b865-08ddb4a97b44 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?hfbfB7gaC26wKxSrljeamw2kRP8av1dCrNmihSZsloV6+g58Joi/DVwkPuPf?= =?us-ascii?Q?BpjHohdV1TFLCPUSouhThRJoUgwE+vKYyPR7aKtsLYJUiNJM8egsWzHhYBIf?= =?us-ascii?Q?NJ/crKCXuWJVTibOl0fllBz36NtAH7Vznj9KeqgcEIl9H1/rLf7kGJNkjcZj?= =?us-ascii?Q?aeoDDZ58TIWGA0BsAyly7beWehJttUuo3/uJ/6NC5J1+vEwxd/psn36JmtXS?= =?us-ascii?Q?w8jTp3uQ5xfF6C+HvcDGdw9Tz9RJ8Nn5gulLwOfeGz8g/SxxGoHKpzdc8QUa?= =?us-ascii?Q?B1h/siE2HAhQNEYPObgN0X8DtCu1zE2crfzn1+vrNNW9P9l9sLlGBYqovhXG?= =?us-ascii?Q?7bAhsazYbCNco0n2zdYJO93349zJ+iSoEPmMZWi1lpSMXyoCVKKEqJDuNDq9?= =?us-ascii?Q?VfwhC9P7EolAwy0CPu+AwxaCo6aMF2Ur7iK992cDwmechitEKWf4nUiCojES?= =?us-ascii?Q?6RwGltysAoJ2cuYe3zuBKagcuHfkLy11UbkxwTtRW0pLoZncHnrX2xgALIei?= =?us-ascii?Q?07S7G/LTcSTB+jY4gjZJC7YMxx1pp45tr20F7k5aOi/uBixI6gnlJ9jAsAIc?= =?us-ascii?Q?l3XdVLUhEhHqaTcudGOKDHJH5gYrdfI2nXA8FoqBtP8twuzyNogPxtqyQX0A?= =?us-ascii?Q?xMpWGhKcXGAlrV37gb6uNl27/A4YkdDZFdstKkefZeuC0kDlDXlsrYjR8Z+T?= =?us-ascii?Q?AXFnEF+Yt46pHAam1L8X1dmtdLsg723sENhfEvBnfKGPcQ25GQQauczv7J0a?= =?us-ascii?Q?6pVoszU8a52RBXO0jkNkvxvHbtzJEJ8SudeK81YQr+85ulqNQBAClQfujr1k?= =?us-ascii?Q?ERl7g+ogBRQaXsk5DAh2+VDhGhQn4nypZv1Wh/un+jGTHTAWUd51ITlUYQyG?= =?us-ascii?Q?6HPBRiUY9b54AMDKzp1ajZRvHeAmTGTCQYPzEd8rOXfQetfIHr/Ozujqq0cP?= =?us-ascii?Q?/HXmyI/pYsEVw+Rvrf0C8DCjm7Y3eDFklnmPXBDMXl9Jh1/eraq6cfTO6BUi?= =?us-ascii?Q?0Ghrfa20wblldFGTyWpNH7262E2zno+qYKuhfJ+CLh91wcnuRaEuOQB5gluz?= =?us-ascii?Q?feOMiICB0xgrOeu6mA3u3cx3bF915EyDrSXaQ78xJ+YX9wzqS6g0wBivjqdF?= =?us-ascii?Q?K+OjrHyHGbOrAs4WRc+dMfvDU951GIymiIeQJGxq8uQ/4jxqyALI6PPVYis4?= =?us-ascii?Q?GHCeZ1fFBCAGbp6aDg6QzL61d/RUQS0uxz7Xi8+/UaSqJpeL33oyoaF6SCWv?= =?us-ascii?Q?5zG6wv9udt07D9v/Jr1lfALgCQGxqj4x+8uzgvL8zqhNFO7a3aKtvILXmHp1?= =?us-ascii?Q?Gn/6AZ8rO5PrJiKLUEQLRe+MK/N+dk250h9JOZXcINCJnuausICXIKbuX9Z2?= =?us-ascii?Q?U1prv4EHJ/UNim+K8IRaYll3LU+5DNrpps61yj4KWpKp3Z+c+18jeiQQTqe2?= =?us-ascii?Q?+7N5HsoBAQrWQpS3yGZFhUsrQfx6yWu0MlLihweyWLdaa3PTw3acvVt8Wa9G?= =?us-ascii?Q?CF8jmjfT4Dqk7MZddfMpcaEkCkMvJgyNaFz7rEmG+FOvHtBKB25Bpb63aw?= =?us-ascii?Q?=3D=3D?= 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)(82310400026)(36860700013)(376014)(1800799024)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:03:36.5074 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: acf79446-c450-4850-b865-08ddb4a97b44 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: MN1PEPF0000F0E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6098 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 06/28/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=62558d956aba801fa0da6fc3ce693ce8b1308cf3 Thanks. Xueming Li --- >From 62558d956aba801fa0da6fc3ce693ce8b1308cf3 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 2 Apr 2025 08:53:58 +0200 Subject: [PATCH] vhost: fix wrapping on control virtqueue rings Cc: Xueming Li [ upstream commit 38e640038798da92d1b7daf953f06fcd116cb952 ] The idx field of a virtqueue available ring is increased by the driver regardless of the ring size. It is for the device to mask this index modulo the ring size (2.7.6 of the virtio 1.3 specification). The same applies to the used ring. Failing to mask triggers: - crashes when popping message received on the cvq, - system lockups (in the case of VDUSE) when the virtio-net driver waits infinitely, Fixes: 474f4d7840ad ("vhost: add control virtqueue") Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin Tested-by: Maxime Coquelin --- lib/vhost/virtio_net_ctrl.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/vhost/virtio_net_ctrl.c b/lib/vhost/virtio_net_ctrl.c index c4847f84ed..355ab85009 100644 --- a/lib/vhost/virtio_net_ctrl.c +++ b/lib/vhost/virtio_net_ctrl.c @@ -40,7 +40,7 @@ virtio_net_ctrl_pop(struct virtio_net *dev, struct vhost_virtqueue *cvq, return 0; } - desc_idx = cvq->avail->ring[cvq->last_avail_idx]; + desc_idx = cvq->avail->ring[cvq->last_avail_idx & (cvq->size - 1)]; if (desc_idx >= cvq->size) { VHOST_LOG_CONFIG(dev->ifname, ERR, "Out of range desc index, dropping\n"); goto err; @@ -167,8 +167,6 @@ virtio_net_ctrl_pop(struct virtio_net *dev, struct vhost_virtqueue *cvq, } cvq->last_avail_idx++; - if (cvq->last_avail_idx >= cvq->size) - cvq->last_avail_idx -= cvq->size; if (dev->features & (1ULL << VIRTIO_RING_F_EVENT_IDX)) vhost_avail_event(cvq) = cvq->last_avail_idx; @@ -179,8 +177,6 @@ free_err: free(ctrl_elem->ctrl_req); err: cvq->last_avail_idx++; - if (cvq->last_avail_idx >= cvq->size) - cvq->last_avail_idx -= cvq->size; if (dev->features & (1ULL << VIRTIO_RING_F_EVENT_IDX)) vhost_avail_event(cvq) = cvq->last_avail_idx; @@ -229,13 +225,11 @@ virtio_net_ctrl_push(struct virtio_net *dev, struct virtio_net_ctrl_elem *ctrl_e struct vhost_virtqueue *cvq = dev->cvq; struct vring_used_elem *used_elem; - used_elem = &cvq->used->ring[cvq->last_used_idx]; + used_elem = &cvq->used->ring[cvq->last_used_idx & (cvq->size - 1)]; used_elem->id = ctrl_elem->head_idx; used_elem->len = ctrl_elem->n_descs; cvq->last_used_idx++; - if (cvq->last_used_idx >= cvq->size) - cvq->last_used_idx -= cvq->size; rte_atomic_store_explicit((unsigned short __rte_atomic *)&cvq->used->idx, cvq->last_used_idx, rte_memory_order_release); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:18.348364504 +0800 +++ 0015-vhost-fix-wrapping-on-control-virtqueue-rings.patch 2025-06-26 19:59:17.218418051 +0800 @@ -1 +1 @@ -From 38e640038798da92d1b7daf953f06fcd116cb952 Mon Sep 17 00:00:00 2001 +From 62558d956aba801fa0da6fc3ce693ce8b1308cf3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 38e640038798da92d1b7daf953f06fcd116cb952 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 999e84db7c..63c0a06b4f 100644 +index c4847f84ed..355ab85009 100644 @@ -37 +39 @@ - VHOST_CONFIG_LOG(dev->ifname, ERR, "Out of range desc index, dropping"); + VHOST_LOG_CONFIG(dev->ifname, ERR, "Out of range desc index, dropping\n"); @@ -45 +46,0 @@ - vhost_virtqueue_reconnect_log_split(cvq); @@ -48 +49,2 @@ -@@ -180,8 +178,6 @@ free_err: + vhost_avail_event(cvq) = cvq->last_avail_idx; +@@ -179,8 +177,6 @@ free_err: @@ -54 +55,0 @@ - vhost_virtqueue_reconnect_log_split(cvq); @@ -57 +58,2 @@ -@@ -231,13 +227,11 @@ virtio_net_ctrl_push(struct virtio_net *dev, struct virtio_net_ctrl_elem *ctrl_e + vhost_avail_event(cvq) = cvq->last_avail_idx; +@@ -229,13 +225,11 @@ virtio_net_ctrl_push(struct virtio_net *dev, struct virtio_net_ctrl_elem *ctrl_e