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 BBE59433D8 for ; Mon, 11 Dec 2023 11:13:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5A2A41140; Mon, 11 Dec 2023 11:13:51 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2074.outbound.protection.outlook.com [40.107.101.74]) by mails.dpdk.org (Postfix) with ESMTP id 85C8541140 for ; Mon, 11 Dec 2023 11:13:50 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hIUaeo3ZAx1EagBW+Nmo3YqA9yZ5912PKFcc7jsHhHmCJieZlW7/n+7Gd6xlSiRA18TA0AofC6XSE/71k4Ui0BVsluXJwjJ/uIt9ZMAElwD6A57rCAQoa117USvGT5uehCgZCWIFMnAQQ3se0Ynv0+WbjKAfUo3U+v0ImWSnS7MW4n4fELvLHaQfbhtHiOQGpZfA3gPuhv2/cMucm5ISx7IMXuG0WIVuPv4z86gmgoPSXlw4ril9MwXSu9bLV9NVKGdAJtbM3dZ5qWl8SiyjaBKp5j3fKOIDV0x4qL4HzRkGZq8RSwhY7UzRgT5WkDpqY+mmjohSJfuiSW7UmlhVOg== 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=my0yDiTZ+/tTT9V+vKorV+abQ8JfelHfj6UmiQgdeug=; b=XfGt1Omn4yA0po5jvAIU9GLNERs31hFVpV/tMUi9kC5FevEM4W5SZjR4ozbdgy6pB++BdcHd5S9yU16n3Q+nMqmOsyfgtkmP/4qqDOL5oexdzhocW1lg0Ew7nu933oh1FEJlg9pSFWao7HoIpcyTFxrDZctKykJrzOJAJRI1Pbz8IFybYaBulXzgc8Kf12ibut4RPA8XofrzrP+kNNwtGLx9ggsoDxg1WYIRWOlnj8t36J9Y75d27kPF7MqV9M6EWLhPT3+GCBmK0n7wdjYuws9au9AstKmbt8rEcjNAlgkPFHjNnF+UCaogri680y6GDiTVrtR/5d9rO0A4bSuNvQ== 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=my0yDiTZ+/tTT9V+vKorV+abQ8JfelHfj6UmiQgdeug=; b=p/VVtL1TapxR0+TrKH2sahYRAl9C9KpGc4viMV1Szue+fSboI9sYyko7MCvhogYB+7fL/bMxKR2VF2eXnfFxwWGrH7nBG+fdHavRHwSIIgnOsb59hUT63+xcf4YcqI6iTFXGGI5NBjTkdMFqT7/5oXb7dAaNAH+dlxTLgnIlnvOEbnnSkwabHCjeot4dzMq7GEkI4VfAka11UFYmYQU6uGoiz0R0dwaEwHz8fyPsStq/l2dVPjL+tYsR2zIfQI5Opf+DePYvyF4LiLQXcv8mmLnXPdTm5Y3r/uI60Rlpwswckrnhp1kbU4leN33XiCvgP3UMoMI8TTRfpnezIO366Q== Received: from DS7PR03CA0234.namprd03.prod.outlook.com (2603:10b6:5:3ba::29) by SA0PR12MB4445.namprd12.prod.outlook.com (2603:10b6:806:95::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:48 +0000 Received: from DS3PEPF000099DC.namprd04.prod.outlook.com (2603:10b6:5:3ba:cafe::5e) by DS7PR03CA0234.outlook.office365.com (2603:10b6:5:3ba::29) 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:47 +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 DS3PEPF000099DC.mail.protection.outlook.com (10.167.17.198) 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:47 +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:36 -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:34 -0800 From: Xueming Li To: Maxime Coquelin CC: David Marchand , dpdk stable Subject: patch 'vhost: fix checking virtqueue access in stats API' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:37 +0800 Message-ID: <20231211101226.2122-13-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: DS3PEPF000099DC:EE_|SA0PR12MB4445:EE_ X-MS-Office365-Filtering-Correlation-Id: 3857186f-8f39-4b2f-377c-08dbfa31dd5e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ukvAW2lNrthCSbzc2/9uC+HMhLQwCI7Xkxi9rItpqBzgdvjxu44ovEnJQW7KLHCSekPZy2Lxb8TMVaRFb1244yBExCceig0V918DftmsmXTjbW286R4d17k5X8oeEh1cBG5tToXj7pRfJ0jT82naDOqR+bmE2JaIxiUQ+kG/0tCVp2GrKK+4OUa6G4cvMped4CLLxoyw/B5d6mya857q20bYDjZyXvE/1ZChVV2Ak2UE4MVbjbmVM+TAvHmUxcQATjdMNtH4j1cJQTCCj6Nyp9LmCBmJ2o24XsMnmftgToNAwQUf4C0DiWMYU3Ne2LeD//TnobtP/HvssE4KFryKbNgVmAOXQ9omipMkRAZ5zU0kub2pZikKFLHS8iTs0Fe0cz+jyyAY4Ms0NN7htmL63ry9IcGiHTqib0M9QCXzbfCNleI0QstHNCAWZCq9lMa8VXYiITK0Rdv8+9w4nkvDuVboFp5QTd2SF75wxxoQV2K1xiuIvAwzmtAsT0c4ega09JDQx2q82Bf+ejHkNGkSJry9s05peJfq/aS/RQkopMRyYu906Lzk3iXCjv44yrtwrWOBG3J/OA3y2SDBpjhojSDz2k87mCD72V7DvzzpRYkqkX81ubE3mAIpIAAsz/log3c4x/4VG+nxxrZ3kyvQQVj9+45/yiQw9S6vO/Xk1QqoGYX/1ksrUJWkvYHHCh+kosmgXEwJH78eLG0J5Hy/pm8NaxSgzwNxZerZHsLKHK+7Blxh/ADplcHl+0AEm2StkQQuutS9BoNvQfReAHAFiGiHwFRmFZzVMnDsiXLmKHY= 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)(39860400002)(346002)(376002)(396003)(136003)(230922051799003)(186009)(1800799012)(82310400011)(64100799003)(451199024)(40470700004)(36840700001)(46966006)(40460700003)(4001150100001)(2906002)(41300700001)(36860700001)(36756003)(86362001)(7636003)(82740400003)(356005)(2616005)(1076003)(336012)(26005)(426003)(16526019)(6286002)(478600001)(53546011)(7696005)(47076005)(966005)(83380400001)(4326008)(5660300002)(316002)(70586007)(6916009)(70206006)(54906003)(8676002)(8936002)(55016003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:13:47.5931 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3857186f-8f39-4b2f-377c-08dbfa31dd5e 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: DS3PEPF000099DC.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4445 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=8c291d87783d2e22e6234cddc23bee27d0f14dae Thanks. Xueming Li --- >From 8c291d87783d2e22e6234cddc23bee27d0f14dae Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 20 Oct 2023 10:48:04 +0200 Subject: [PATCH] vhost: fix checking virtqueue access in stats API Cc: Xueming Li [ upstream commit a004501a147889d608008ab6f18355e9b0ceff65 ] 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: be75dc99ea1f ("vhost: support per-virtqueue statistics") Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- lib/vhost/vhost.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 6e1bba4391..40ac350e21 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -2138,6 +2138,7 @@ rte_vhost_vring_stats_get(int vid, uint16_t queue_id, struct virtio_net *dev = get_device(vid); struct vhost_virtqueue *vq; unsigned int i; + int ret = VHOST_NB_VQ_STATS; if (dev == NULL) return -1; @@ -2154,14 +2155,22 @@ rte_vhost_vring_stats_get(int vid, uint16_t queue_id, vq = dev->virtqueue[queue_id]; rte_spinlock_lock(&vq->access_lock); + + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + for (i = 0; i < VHOST_NB_VQ_STATS; i++) { stats[i].value = *(uint64_t *)(((char *)vq) + vhost_vq_stat_strings[i].offset); stats[i].id = i; } + +out_unlock: rte_spinlock_unlock(&vq->access_lock); - return VHOST_NB_VQ_STATS; + return ret; } int rte_vhost_vring_stats_reset(int vid, uint16_t queue_id) @@ -2182,10 +2191,17 @@ int rte_vhost_vring_stats_reset(int vid, uint16_t queue_id) vq = dev->virtqueue[queue_id]; rte_spinlock_lock(&vq->access_lock); + + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } memset(&vq->stats, 0, sizeof(vq->stats)); + +out_unlock: rte_spinlock_unlock(&vq->access_lock); - return 0; + return ret; } int -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.623239500 +0800 +++ 0012-vhost-fix-checking-virtqueue-access-in-stats-API.patch 2023-12-11 17:56:22.887652300 +0800 @@ -1 +1 @@ -From a004501a147889d608008ab6f18355e9b0ceff65 Mon Sep 17 00:00:00 2001 +From 8c291d87783d2e22e6234cddc23bee27d0f14dae Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a004501a147889d608008ab6f18355e9b0ceff65 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -17,2 +19,2 @@ - lib/vhost/vhost.c | 21 +++++++++++++++++++-- - 1 file changed, 19 insertions(+), 2 deletions(-) + lib/vhost/vhost.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) @@ -21 +23 @@ -index 9a7403c28d..8a1f992d9d 100644 +index 6e1bba4391..40ac350e21 100644 @@ -24 +26 @@ -@@ -2201,6 +2201,7 @@ rte_vhost_vring_stats_get(int vid, uint16_t queue_id, +@@ -2138,6 +2138,7 @@ rte_vhost_vring_stats_get(int vid, uint16_t queue_id, @@ -32 +34 @@ -@@ -2217,6 +2218,12 @@ rte_vhost_vring_stats_get(int vid, uint16_t queue_id, +@@ -2154,14 +2155,22 @@ rte_vhost_vring_stats_get(int vid, uint16_t queue_id, @@ -35 +37 @@ - rte_rwlock_write_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock); @@ -43,3 +45 @@ - /* - * No need to the read atomic counters as such, due to the -@@ -2226,15 +2233,18 @@ rte_vhost_vring_stats_get(int vid, uint16_t queue_id, + stats[i].value = @@ -51 +51 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock); @@ -58,8 +58 @@ - { - struct virtio_net *dev = get_device(vid); - struct vhost_virtqueue *vq; -+ int ret = 0; - - if (dev == NULL) - return -1; -@@ -2248,14 +2258,21 @@ int rte_vhost_vring_stats_reset(int vid, uint16_t queue_id) +@@ -2182,10 +2191,17 @@ int rte_vhost_vring_stats_reset(int vid, uint16_t queue_id) @@ -68 +61 @@ - rte_rwlock_write_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock); @@ -74,4 +66,0 @@ - /* - * No need to the reset atomic counters as such, due to the - * above write access_lock preventing them to be updated. - */ @@ -81 +70 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock);