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 B069D433D8 for ; Mon, 11 Dec 2023 11:13:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA8B040E0F; Mon, 11 Dec 2023 11:13:26 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2068.outbound.protection.outlook.com [40.107.223.68]) by mails.dpdk.org (Postfix) with ESMTP id B21E2402E9 for ; Mon, 11 Dec 2023 11:13:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hCNZD5Z3b9cXJi3RWyXBAE5nRjDvfwV7+sgidEtYpfRfiV/Y2nsfxl00Gei7yqilAnSJpQhXlmZX9Jnz3RH2z+ciYin6cSRjoRWbB4/kcM9yERm/SbkFaNND6740xZHfPqZRvVZ87cChtSVG8HWlieYrL1g6wBIuL1fykNA838rKr3MXtB55NQBBUHT2Y2BaWmyLOBriBK/dwoJaCDl4Fmn3KrKInE7kj2ATMQXIWroaAIOw6y9h7iSWRCl43wssIM5ju6l5bKSwH2pk/jzUljbbxIK2Wgz38OQarp2ygtCmdi8oZHITUVY2QtiVA1+xUJCLeRqgx16UCGUxT6bQ/Q== 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=5vR1Ws0ySaiad9Z70X3h8KQWCYsp28VXaOH0KcW0edk=; b=Gdc5HUk/kfJK4EiMnQ/kqREPkzMD8C2LzywPoewmBY5xyY/t7A0JqNfbJzzFGwS2Keqa9oh5/WgceSrWFVCwrtz3WCp4mHLQQf2cg6W7k1HF2bTYdrR8Z82mEXkEH70vPmjFgr8s+VHNS890CeIC8NQbG5/x/KZTOJgfvXv+lIUWYUCTwJ1LVfSk6Ymxe0rnejj6gMDu6ckC13vRbaHoLI/Fan70H7B6qSqJmfDvGhfTFob8XrIL8S9I1MKLUhT35jidJMy2fuWdvIl8ASjpuzZl8Vr8tpj5vVpuck2jJvFVzpgRe9xkOUcfxNa66CjSWYlmTzt3beJdJa5/LDkj6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=5vR1Ws0ySaiad9Z70X3h8KQWCYsp28VXaOH0KcW0edk=; b=BAOWjTU1R08Y3Az9b4bh3sgm7o2amz5e8A0kST9fEOmu1pGK0XnKHlaO1uDVWGnAGwxeg8Z9JreaLYs5t2vQkF8obghv5O1TJ6C0Ib0TRRDweR3IZnPSl4Ec10DNMAjuCtUyIVGeEym/nTzE08V5Fg/BV/6bvtc0r5ighE4MxBhHvUzLu7igneO9VxZywRbbrq1VDHjf8s/58IdU8ryMFqhr7s8Z/pcMffNpiNhC8XJNVvC2eVINQeGXTgs5iQjwSGzzQHsZir7BPbCNU7crmpND1wb5ZpC9x1W2hXTNFD3BDBERIziptKUqi7pvwlZgb2I0xCkl1NYlSVsGrlPUOA== Received: from DM6PR11CA0070.namprd11.prod.outlook.com (2603:10b6:5:14c::47) by SN7PR12MB7372.namprd12.prod.outlook.com (2603:10b6:806:29b::15) 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:22 +0000 Received: from DS1PEPF00017097.namprd05.prod.outlook.com (2603:10b6:5:14c:cafe::83) by DM6PR11CA0070.outlook.office365.com (2603:10b6:5:14c::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:13:22 +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 DS1PEPF00017097.mail.protection.outlook.com (10.167.18.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.19 via Frontend Transport; Mon, 11 Dec 2023 10:13:22 +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.41; Mon, 11 Dec 2023 02:13:12 -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:11 -0800 From: Xueming Li To: Maxime Coquelin CC: David Marchand , dpdk stable Subject: patch 'vhost: fix missing check on virtqueue access' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:33 +0800 Message-ID: <20231211101226.2122-9-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: DS1PEPF00017097:EE_|SN7PR12MB7372:EE_ X-MS-Office365-Filtering-Correlation-Id: acf8167f-cfc5-4615-77fe-08dbfa31ce44 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UKsjM7uN5rDXq2pKPKxXJHKlkGvQQ90hzp8KTDNAS6bZPM6Z0fTBJKcDxOXt6Oh+2So9QVGCoYa05p5ydh5dJCe5qHZMyXV1JEd9pwo4U8ziZIjh34+TQbacxMJQy2jC1M4iv1pnZL8dgvypban5o6N04iAzEtBVMKYgEwp8u9xqNYCzLUfi8R7rZL2ilUCGCL84zQOHtwW/5zGCibImrywa1ggs8pmJhtDQzvi2TervrjgPrOIwJ6Ba8r3DPoO497oIMdKIoEV2FXveKmvQd8+Jn8+MqaicjwWjXRi8BsPPKzkM1HcUHbDAUHcTR0N431yD4fPJqwKMair9qX5YZIQkyz8aqdRs7+fqh1bajwZVSlycQsfVFFHG9ctl5Baf81tyEBQzHfaeN0W4jSC5/cj+1rOgtajzaElrF8w3W8gpsVjxec1eeXN6wQIA6oFfnFSngqHC9VJw1T1Ww+OqlRZtjctbUgBpwQtbLus16x/c9/xgrSpEEMopAytfZsawk1WNVst6tO4L3YzmUP8cmx3KTjgnvGXW2sb7MfEtORTK/jUaOEOseHg7DXl4176+ek7YKdchEtrjoCLZch+jB2AzsHp0Cm4sxMMgLec/JiaIZeKBBjwASngXkVeq6YKxn3vKPYN5/Dm8rn1rh0Kz4dJgb3jgZHmofIeH6dTQXPz20kHcqHvPcM0g4g0HPNGXdzlClwd94mWyGC9RKxpjuns12RgIpx8rHbRHV3xaZqsxo/T6CxGtwjD4qq4YCPg4T8jLdkKzRzTAs6e76PHi5m0keUXZ8fZtWxj3Ty6RVmQ= 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:(13230031)(4636009)(346002)(39860400002)(136003)(376002)(396003)(230922051799003)(64100799003)(82310400011)(186009)(451199024)(1800799012)(46966006)(40470700004)(36840700001)(55016003)(40480700001)(426003)(336012)(16526019)(6286002)(26005)(1076003)(2616005)(40460700003)(82740400003)(86362001)(36756003)(356005)(7636003)(83380400001)(5660300002)(6666004)(53546011)(7696005)(47076005)(36860700001)(8936002)(8676002)(70586007)(70206006)(966005)(54906003)(316002)(6916009)(2906002)(4001150100001)(41300700001)(478600001)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:13:22.2429 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: acf8167f-cfc5-4615-77fe-08dbfa31ce44 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: DS1PEPF00017097.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7372 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=2dc5b2aadd3576a168b8a6c8e4e105313022b432 Thanks. Xueming Li --- >From 2dc5b2aadd3576a168b8a6c8e4e105313022b432 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 20 Oct 2023 10:47:59 +0200 Subject: [PATCH] vhost: fix missing check on virtqueue access Cc: Xueming Li [ upstream commit 094c442cdbf1da3a19ae82ca7069fee8b3a43343 ] 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: 4e0de8dac853 ("vhost: protect vring access done by application") Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- lib/vhost/vhost.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 69e1a9b049..0188bdb6c5 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1382,7 +1382,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) rte_spinlock_lock(&vq->access_lock); - if (unlikely(!vq->enabled || vq->avail == NULL)) + if (unlikely(!vq->access_ok)) + goto out; + + if (unlikely(!vq->enabled)) goto out; ret = *(volatile uint16_t *)&vq->avail->idx - vq->last_used_idx; @@ -1474,9 +1477,15 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) rte_spinlock_lock(&vq->access_lock); + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + vq->notif_enable = enable; ret = vhost_enable_guest_notification(dev, vq, enable); +out_unlock: rte_spinlock_unlock(&vq->access_lock); return ret; @@ -1537,7 +1546,10 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) rte_spinlock_lock(&vq->access_lock); - if (unlikely(!vq->enabled || vq->avail == NULL)) + if (unlikely(!vq->access_ok)) + goto out; + + if (unlikely(!vq->enabled)) goto out; ret = *((volatile uint16_t *)&vq->avail->idx) - vq->last_avail_idx; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.507470400 +0800 +++ 0008-vhost-fix-missing-check-on-virtqueue-access.patch 2023-12-11 17:56:22.887652300 +0800 @@ -1 +1 @@ -From 094c442cdbf1da3a19ae82ca7069fee8b3a43343 Mon Sep 17 00:00:00 2001 +From 2dc5b2aadd3576a168b8a6c8e4e105313022b432 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 094c442cdbf1da3a19ae82ca7069fee8b3a43343 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index b438330063..43173c9eee 100644 +index 69e1a9b049..0188bdb6c5 100644 @@ -24 +26 @@ -@@ -1420,7 +1420,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) +@@ -1382,7 +1382,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) @@ -26 +28 @@ - rte_rwlock_write_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock); @@ -36 +38 @@ -@@ -1512,9 +1515,15 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) +@@ -1474,9 +1477,15 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) @@ -38 +40 @@ - rte_rwlock_write_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock); @@ -49 +51 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock); @@ -52 +54 @@ -@@ -1607,7 +1616,10 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) +@@ -1537,7 +1546,10 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) @@ -54 +56 @@ - rte_rwlock_write_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock);