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 3D861433D8 for ; Mon, 11 Dec 2023 11:13:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 37B0240E0F; Mon, 11 Dec 2023 11:13:36 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2077.outbound.protection.outlook.com [40.107.93.77]) by mails.dpdk.org (Postfix) with ESMTP id 22644402E9 for ; Mon, 11 Dec 2023 11:13:35 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WDUdtG3HVGm19Hj2+MDZt+1Nv869ltMo83jBpIS8H0TQJaV7KpU7QdxQzQiKKFkxgCXjeEFcb6LO0g72+9Kmg06EBPQFbZ6u9D9unlCpLD4eYw4Axg9DCIwm5nXCG8+5nMq32DPfOMvOTn1SgLEZHhuMaa3qwuiZJQYl0ZbdBapwz2beBl4WWCldLTvDdbBpp/yMv4OwUJGBMuOPj5tEPtkW2n47eerw+Lk8g9aNTHcDPfgzETvQ9pjgIusE3VSefWzgnRi09IMtyQcz+tsszH33UkXfzbVTSgDN9upUjixXYTYFYGpePlVYIDfw0tCoyze75u5Gw0pHwJmpzXQTIg== 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=XnvefJm+hwYqz2khNI/ffwNkG9PHdhJKjOnJzGxeW4I=; b=UDa9D24bO/zZu5YKX8FainQODNDi6nlqXJDLcTMWwhMWwjGkZkIbLEKoNZ+2K3Uq6DddiG273TVZa2eqqN5eWBEL0gAhzjwNpxTsFl1ukPLpTWTsZ3lNMkphaE4eqOSC03WJw8e0lKXvZ8e2JytfbrWHm7LWdspWEl+qw06GMqJlvtJbZCQiGpn4mXAyQJLPGkYyKwxowJxYMKW3G0mE+FVZ2wTeoQiN+vuqwOrBLEP1fXyTYKI8kxLr8OLZv6qBY0WATlKZZby1+zN9SNGAeOoJ5tMOJCpEruYGprS7u5C5Di5oVySO1K19eVM6ku0LM/qERWKUMmtunNe+lf+Teg== 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=XnvefJm+hwYqz2khNI/ffwNkG9PHdhJKjOnJzGxeW4I=; b=qZJdFJgwUOVV0c20r4ypJuGaokcfRsa94wvXj0TcKXYn4UQIhkyyQb9GTKG7hKV1EwiMMBeeaHdtMU8MGYE9IiCi7LjUympTlYuh8KLx3FkaJ/raLotyzGHWA6vLLL1EauWIEqonXI48UpXOySaRsEnvOPF+8wN5oqz7Z5vKUzxNpSG4EqR961Tp6iadmK1RWGaUeKM3P8J6cjldfTEY+58MnNDdoYGF1ygK/eGCkxy2GmjhvgGUuYUXfI2h1ctqnsQjFR/bHlWmw6KwzidKbXPR5uD/GGFzfEwiOqh2A4lJFSAMpD7S4pd6FUgsXpRdHtu5FJsxP3La/o8ylIVekQ== Received: from BL1PR13CA0086.namprd13.prod.outlook.com (2603:10b6:208:2b8::31) by PH7PR12MB6811.namprd12.prod.outlook.com (2603:10b6:510:1b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:13:32 +0000 Received: from MN1PEPF0000ECD9.namprd02.prod.outlook.com (2603:10b6:208:2b8:cafe::2e) by BL1PR13CA0086.outlook.office365.com (2603:10b6:208:2b8::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.23 via Frontend Transport; Mon, 11 Dec 2023 10:13:31 +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 MN1PEPF0000ECD9.mail.protection.outlook.com (10.167.242.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:13:31 +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.986.41; Mon, 11 Dec 2023 02:13:14 -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.986.41; Mon, 11 Dec 2023 02:13:12 -0800 From: Xueming Li To: Maxime Coquelin CC: David Marchand , dpdk stable Subject: patch 'vhost: fix check on virtqueue access in async registration' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:34 +0800 Message-ID: <20231211101226.2122-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: 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: MN1PEPF0000ECD9:EE_|PH7PR12MB6811:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a81b29d-ed90-4655-29b4-08dbfa31d3fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vqKsgH9V+KVODM2V6m4q/AOA8L+1EnMTWXJiNcbZkEe/6UeHd2DCsnot04RtIUQCSGhJj7IE4Oyxz3mDtp44hcQJL9HRdtYe2bbfNMviSe3E5yDwRc+G1TQvyhCRsv1SCbdTiXDHeEZ/lqj8ODWgThqzd+P4kduHvsJxiicuL/YXEngbugEA8s4fpJP0Q0ugIoEDgF8btf94IP00HwDPh8R2WPIFCC0pNuvEu5mxngZ6Cs8XBw7YuILc5x4IDGn5yEZo1x82RCtLAKkOiIL0m+9kkZMRbv0+/28PLwS3k1la1joXjHHmCTKOyQP/J4WOL7gJ4wuQhY3fqzjL3wLgebPZEKFXcqyEKz4Ho9jYnW9i4LIkEwjqgLcA0Y0DPbl7jtfutr3ScO3i3Z+9oiVGY8BAzAwB5e9tk6tFk2UuNQ3mfHmmUme93Ej8nsnKKMpkcjnAMJjrGCqXqsT7PMRxPkeRAfHj69yjMuZf7XFgU3N8IM0FRKGQN4Kfofzvqj1xDJ1QTN0LexZv6vS+mVTXOiGlJV53Id4WKv7YPsvJ8voFoNbUBuiwQtaxPa4NZoQ4TXa5N87bhRGMQv5N2OJcx6H62cujrUIj0CbBmYrp2GWKFDt0HcnDDmICDRNGU6Yqw+8vz97u9RWyc5kO4Db9ENFcKyh3J30hWtla2v3Keaapcx772+djQYEdT36Gz62i8qSwkgZ0tonbaPVZJlo5JvUlSdFH31TKQywZ4a/t8Wa4aqDs0wAIvoAyhlN8ISXBcUSmlTegS8XfW+vHqIWWuSilmoRuPd1HCsl+r1NQmiM= 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:(13230031)(4636009)(396003)(346002)(376002)(39860400002)(136003)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(82310400011)(46966006)(40470700004)(36840700001)(55016003)(40480700001)(6286002)(1076003)(26005)(426003)(336012)(16526019)(2616005)(40460700003)(82740400003)(36756003)(7636003)(86362001)(356005)(47076005)(83380400001)(5660300002)(53546011)(7696005)(6666004)(36860700001)(316002)(70586007)(70206006)(966005)(8936002)(8676002)(6916009)(54906003)(41300700001)(4001150100001)(4326008)(2906002)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:13:31.7754 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9a81b29d-ed90-4655-29b4-08dbfa31d3fa 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: MN1PEPF0000ECD9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6811 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/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=7f80528fbdeb8a282ce562270d1ce6de8524595b Thanks. Xueming Li --- >From 7f80528fbdeb8a282ce562270d1ce6de8524595b Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 20 Oct 2023 10:48:01 +0200 Subject: [PATCH] vhost: fix check on virtqueue access in async registration Cc: Xueming Li [ upstream commit 867d31bed41c87510e860956ee6a67c047d98f87 ] Acquiring the access lock is not enough to ensure virtqueue's metadata such as vring pointers are valid. The access status must also be checked. Fixes: 78639d54563a ("vhost: introduce async enqueue registration API") Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- lib/vhost/vhost.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 0188bdb6c5..695aa167dc 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1784,7 +1784,15 @@ rte_vhost_async_channel_register(int vid, uint16_t queue_id) return -1; rte_spinlock_lock(&vq->access_lock); + + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + ret = async_channel_register(dev, vq); + +out_unlock: rte_spinlock_unlock(&vq->access_lock); return ret; @@ -1840,6 +1848,11 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) return ret; } + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (!vq->async) { ret = 0; } else if (vq->async->pkts_inflight_n) { @@ -1851,6 +1864,7 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) ret = 0; } +out_unlock: rte_spinlock_unlock(&vq->access_lock); return ret; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.537453100 +0800 +++ 0009-vhost-fix-check-on-virtqueue-access-in-async-registr.patch 2023-12-11 17:56:22.887652300 +0800 @@ -1 +1 @@ -From 867d31bed41c87510e860956ee6a67c047d98f87 Mon Sep 17 00:00:00 2001 +From 7f80528fbdeb8a282ce562270d1ce6de8524595b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 867d31bed41c87510e860956ee6a67c047d98f87 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index f7e5602913..53318a54a3 100644 +index 0188bdb6c5..695aa167dc 100644 @@ -24 +26 @@ -@@ -1859,7 +1859,15 @@ rte_vhost_async_channel_register(int vid, uint16_t queue_id) +@@ -1784,7 +1784,15 @@ rte_vhost_async_channel_register(int vid, uint16_t queue_id) @@ -27 +29 @@ - rte_rwlock_write_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock); @@ -37 +39 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock); @@ -40 +42 @@ -@@ -1911,6 +1919,11 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) +@@ -1840,6 +1848,11 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) @@ -52 +54 @@ -@@ -1922,6 +1935,7 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) +@@ -1851,6 +1864,7 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) @@ -57 +59 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock);