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 12756433D8 for ; Mon, 11 Dec 2023 11:13:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C48940E0F; Mon, 11 Dec 2023 11:13:33 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2085.outbound.protection.outlook.com [40.107.93.85]) by mails.dpdk.org (Postfix) with ESMTP id 3E830402E9 for ; Mon, 11 Dec 2023 11:13:31 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hd24qGwaczQbPUBIegdXegfcpCQDDaCnyxYbafJe5GrqIQkxL81rklD68KWxqLUl4fytjunm8AZpdeZQgMquJxGvf9SXOOpVyT5kThNavlCdpLXI/mGJ4WaS9nhEZuE//pBayIEchYyGPQ4TrxFoXTfX45ezFKQZKt0dEN30lQvTSs9sK1MFu2Xg0wNAkRLo1aWaxwrLIDom3nfWdCDryZ27X9YytUo5TeM/2J+lMVpJOlSQl+b2SQ5UxtlryoQjhaKBdzkztciIakQ6RdkfRlRpwGF0J0L8AkCucsD515o4woEAxJbnMR9SJ86KcIszaz/1OQR4pI0dSNqmV4mxIA== 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=VCzb8BOqpBFa903ZPTFU+kNrdBP2L2jytuH6MgzNL/8=; b=ewASVBraYGGD221G/RWySpfbRVWdySB77C0CE/Y036joU1Bh/kjkulQ8c22RsOI4qNxIF8p4npakjpBKFKzfPK7ZG2+KtnwuANQRWcRz/Kv7wciawJ9axipa/gZIY2pYduXJ5rJbg26uvxDJ3UhdCtJY2QU1jQ/oE1YeL2POpO5SLQpcQhh1vOvGHwwwfvXSIIdLKuVNGMwCZPBSOVI2cP+B2Cloqm03wjxKqzlF+1INgDsQ3/3FiNVk/vuuwG1doSj1qy2JFpiKsp2ti0osRzXjLq5fVB7t1eLko+RNSUXl0aAAlwuu9/MQtSb3GqcVfmZ0uAIyMBenOotEWYjMvQ== 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=VCzb8BOqpBFa903ZPTFU+kNrdBP2L2jytuH6MgzNL/8=; b=KlvUuHv7Wq4MM2GkSeQkkwk4vxmzm5qJcE0tNQZwpM6g3DDYiBx1fwSfbM27m9cAmQ5pNjY6AxYQ0d8vjsnUHiDkHcMK/p5aSAQMYYIjZRVOB3wqppl0E78iARDB03sC4h6JKOcah5LUbeekvrwMd/HNRpvn7gsDyBukwZIaJAqCVyLVyordB+Z2V7xczoPwLKJxPBcPduOTHWIWI9/+QKLjoOPiHY24CWI5Jd4zAHbA2PEyybXb2fNglWdkuDkJx0HMwuHFLo3HkDA2XGvo3QKVODxb0rfCLV6cZW3SFMbXS1mZ5GIXl3h6Aoic9ZxE4KvAxOHwy3gJq6S/kzNn5A== Received: from MN2PR17CA0011.namprd17.prod.outlook.com (2603:10b6:208:15e::24) by PH7PR12MB6395.namprd12.prod.outlook.com (2603:10b6:510:1fd::14) 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:28 +0000 Received: from MN1PEPF0000ECD6.namprd02.prod.outlook.com (2603:10b6:208:15e:cafe::15) by MN2PR17CA0011.outlook.office365.com (2603:10b6:208:15e::24) 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:28 +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 MN1PEPF0000ECD6.mail.protection.outlook.com (10.167.242.135) 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:27 +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:10 -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:09 -0800 From: Xueming Li To: Maxime Coquelin CC: Li Feng , David Marchand , dpdk stable Subject: patch 'vhost: fix missing vring call check on virtqueue access' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:32 +0800 Message-ID: <20231211101226.2122-8-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: MN1PEPF0000ECD6:EE_|PH7PR12MB6395:EE_ X-MS-Office365-Filtering-Correlation-Id: db31919b-4277-4a68-a90f-08dbfa31d1b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1uYxpnDRT8Yvu7QByLJ/Au23AjvoDfQafOfySymrh2MINcOXcIAFbhhzGaqNSSNXy6lW2Wl/cymM+ZUG3truw9J8tjxxBmWFFt2lM4ywYqtChel1YyCnRL+CNlamLDAAIuHzSLRHXArubE1ssx75guWyMbyPWKVq/qXOtnRt8r6+o2PE9Kn7i08Dg31lkznmO0foV2h4GyVPH4EbelN0UFJ3f5UaId82LsrZ0SFO+ke3SVv70eV6QNugzeTNVX8q1iIL8ctT6GK9u4SnrYdTZ/Zj91tXVutFfb4hSAE7K7/hTsXcMTiLvRKYaoU27IBUxIsrcEi1HVpzwHWXTxhzmqkdUbxubxbn21CioZmb3Ppq+g9oDpKDvO5iAGhmiauofiYcUqjrRKEWcWryFC0xRf9wGFBgNmfV/oHZqviv2JoUwgHDGHmcaofxj/0XekZ2LEQThkvT0KQM91hYudbDtMmG1k7M3NoiTLQVF09KKm78LMM0Zb6bxnutIze5MrnfuTwqhGPCTFeb0sRqu2iKcwGfdqKqRkh7xobjlYkxAsaTLP7XzwBXUlMwy4Jk3szjVr1+/4XQe/sdu5BnZxhM3d4IrvWT202PVIziBVT5pQZVhpC8hdB+0qfMvENxO0MHpijB58c3zmMIKsRtQtbckwRXa214cNn2NwrkJ9b7dUvgMcBt5Mmp+Ai6a2xTs9hCDU0aNRrbVTLz3dbh/MUveOh7V0enQBsjNzEt7y5xIEbVU2jcJZUQM5VNZOm5CjMbAYqhb9IKGvteK8CCBfrXpekRUWgtxjbYfFvS9ktCfWs= 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)(346002)(39860400002)(396003)(376002)(136003)(230922051799003)(1800799012)(64100799003)(82310400011)(186009)(451199024)(40470700004)(46966006)(36840700001)(2906002)(4001150100001)(6286002)(1076003)(2616005)(478600001)(426003)(6666004)(7696005)(16526019)(336012)(26005)(53546011)(41300700001)(966005)(40480700001)(36756003)(86362001)(36860700001)(40460700003)(55016003)(7636003)(356005)(54906003)(316002)(6916009)(47076005)(5660300002)(70206006)(70586007)(4326008)(8676002)(83380400001)(8936002)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:13:27.9998 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: db31919b-4277-4a68-a90f-08dbfa31d1b7 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: MN1PEPF0000ECD6.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6395 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=ac1162d97a7053a702f3d063d99af431a40d49f2 Thanks. Xueming Li --- >From ac1162d97a7053a702f3d063d99af431a40d49f2 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 20 Oct 2023 10:47:58 +0200 Subject: [PATCH] vhost: fix missing vring call check on virtqueue access Cc: Xueming Li [ upstream commit af7f683615244675fc4f472a2aa42880896476ad ] 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: 6c299bb7322f ("vhost: introduce vring call API") Fixes: c5736998305d ("vhost: fix missing virtqueue lock protection") Fixes: 830f7e790732 ("vhost: add non-blocking API for posting interrupt") Reported-by: Li Feng Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- lib/vhost/vhost.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 19c7b92c32..69e1a9b049 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1294,6 +1294,7 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) { struct virtio_net *dev; struct vhost_virtqueue *vq; + int ret = 0; dev = get_device(vid); if (!dev) @@ -1308,14 +1309,20 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) rte_spinlock_lock(&vq->access_lock); + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) vhost_vring_call_packed(dev, vq); else vhost_vring_call_split(dev, vq); +out_unlock: rte_spinlock_unlock(&vq->access_lock); - return 0; + return ret; } int @@ -1323,6 +1330,7 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) { struct virtio_net *dev; struct vhost_virtqueue *vq; + int ret = 0; dev = get_device(vid); if (!dev) @@ -1338,14 +1346,20 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) if (!rte_spinlock_trylock(&vq->access_lock)) return -EAGAIN; + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) vhost_vring_call_packed(dev, vq); else vhost_vring_call_split(dev, vq); +out_unlock: rte_spinlock_unlock(&vq->access_lock); - return 0; + return ret; } uint16_t -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.478214400 +0800 +++ 0007-vhost-fix-missing-vring-call-check-on-virtqueue-acce.patch 2023-12-11 17:56:22.887652300 +0800 @@ -1 +1 @@ -From af7f683615244675fc4f472a2aa42880896476ad Mon Sep 17 00:00:00 2001 +From ac1162d97a7053a702f3d063d99af431a40d49f2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit af7f683615244675fc4f472a2aa42880896476ad ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index bdcf85bece..b438330063 100644 +index 19c7b92c32..69e1a9b049 100644 @@ -27 +29 @@ -@@ -1332,6 +1332,7 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) +@@ -1294,6 +1294,7 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) @@ -35 +37 @@ -@@ -1346,14 +1347,20 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) +@@ -1308,14 +1309,20 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) @@ -37 +39 @@ - rte_rwlock_read_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock); @@ -50 +52 @@ - rte_rwlock_read_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock); @@ -57 +59 @@ -@@ -1361,6 +1368,7 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) +@@ -1323,6 +1330,7 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) @@ -65,2 +67,2 @@ -@@ -1376,14 +1384,20 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) - if (rte_rwlock_read_trylock(&vq->access_lock)) +@@ -1338,14 +1346,20 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) + if (!rte_spinlock_trylock(&vq->access_lock)) @@ -80 +82 @@ - rte_rwlock_read_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock);