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 F34EC43B86 for ; Tue, 5 Mar 2024 10:53:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE2474026B; Tue, 5 Mar 2024 10:53:21 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2077.outbound.protection.outlook.com [40.107.244.77]) by mails.dpdk.org (Postfix) with ESMTP id 4FC994014F for ; Tue, 5 Mar 2024 10:53:20 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tj4DExFflEOXukGLuQmF2plf7xE0O96W5fP6E4YU+J6og53jkNrGtGSHCtK9bspCB/pTSgHPH91ZUatBkDXD4KAupI99JtAVnPaioFdZm0zUQqYqKBysbyMiDBOv71SSTqKxauag80+y/rJe267ky57Trs+ynu/mv2hFCV91OnNCFRI1E4lwU9ChLIhKPm4EM2a+sfKaN5qQ5fGIYHd4EILvtaLh5l3OIG2y9CgDYfLUb1TX/L+P8mIQbDuy3WcfQIVg4pbyylqpSqGN/kJ35vz03otcSeksKiSCO+hBdPSNu8skyPE0ja5NIY31OVZYaeoJZM/SPHyktgmD5/Ivlg== 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=MqEwXheo792OPTWJovlZXgB85vTvTaY9MtNSltlGbxw=; b=A1WqtGOUk52QGjjshX5EO8iVzL0RbM287a3qBaqc+SdTsE07JcoRkSi+n8VQlmnkn0jpA1A1dV/fU0EVxKPLbOQ8zH0l3YTSaCeq24Eng4yKm0nr/SkPbxYFt7VcLUCH6tq0/aS4nWt9cfzOhSlU4GRSwT1ip4qHO1agXWS2sesjU3w4qCczzf9vLK2XmJSetaaRF1VwhKAKj8S+XqAQFX0r4KQ+T1ZFIqk6KkWwMMIgcEBW+gXJyhwUw/6Mv70gSoB7zxW1/v2CkSjsFoFo6kZBI2f4Hanq58WJFbdDxziErJq2H+Ry0qBizOo+jOVQ/KYYCoaRY2XdPukSpyHpXw== 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=MqEwXheo792OPTWJovlZXgB85vTvTaY9MtNSltlGbxw=; b=DEDnNc5Hza5gtxZQtKTLAJHpSK7+zQgdnAHJB0YTddC48cbdg+0nXUcu5BEkIgt7Z2Z8DSZRwy7nCw4K6uQRdXnR+Ia48S20/tgy0tzbx5TL07PYXx+DDWo5CK/8/3a5pMSNn4V2CKkAB2xL0P6spvL/3iEPb97CGurpf6WJpq+Dz8GrwtOCXjO1HGBei8CbhgBpVvk5bvvfz9FaD3GRFvGeeYjmzoa40MXA717Wris74wUKvyfdTsVorQqrM8w7PAUuEfNPFSMnBKSnEBYMZ7RcgI4hGVPF4Ceqp820SAS606cUgnVfOdiIgjFgC6UD0AfXkvkbIxI7Gc0yNG+bHQ== Received: from BYAPR08CA0054.namprd08.prod.outlook.com (2603:10b6:a03:117::31) by CH3PR12MB8657.namprd12.prod.outlook.com (2603:10b6:610:172::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:53:17 +0000 Received: from SJ5PEPF000001D4.namprd05.prod.outlook.com (2603:10b6:a03:117:cafe::47) by BYAPR08CA0054.outlook.office365.com (2603:10b6:a03:117::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:53:17 +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 SJ5PEPF000001D4.mail.protection.outlook.com (10.167.242.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:53:17 +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; Tue, 5 Mar 2024 01:53:07 -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.1258.12; Tue, 5 Mar 2024 01:53:05 -0800 From: Xueming Li To: David Marchand CC: Eelco Chaudron , Maxime Coquelin , dpdk stable Subject: patch 'vhost: fix virtqueue access check in datapath' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:36 +0800 Message-ID: <20240305094757.439387-56-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D4:EE_|CH3PR12MB8657:EE_ X-MS-Office365-Filtering-Correlation-Id: 21cc831e-aa56-4fa0-7302-08dc3cfa1562 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XzwvIQRSK6cRDSfCVx7iFLWoZJQ/tXAyvepTz7b/omCAnIRgZMggBg0zf5RIZPQQp/S4e9kH8FmPrbZizBw+VRdCiLDY8o5EbDsYLjNcJSqx4GD0OX+mdS53JIBRNp7wp3iRJtpCO3MMkRWQO3LwJ6g6UH2avA72ts1V56ZybLhrRDEO9M7Wn0A5tZSdMwAJ+H17hkhcj1phBOD+CMNPwZL2lJCAIuFgL5jsHhJDOgzMykCzVHSoNdCBjrYNg7wwVt9ZMzwssyMqszH0gfLsmS6DOaiplj1jQ9jP0WIxbrxtohugp1fk1FLRS7hGLSeflLcZOfYXplu2Y+E5C4nvk/IiM2ZEwlFr9u+JOxbpL51HjWTQjCBk76Ypt0UJ18eRrBA6nDE/8gTdyKYPHtvz7uLWhGWvc+z0nbBhR5u+64jkAQ7ZkOL27PcpbEDPd0JekUjSnXJ8qeWvZYJe6bnsbz3rlXI56DI2SmLTqSI5i4hKGFYEjBHOnfDGQTdQNmykT6ESMEXU3SG9z7Ivx08VjzeNHy+t2VoAhi+GVK5sjIRJqPtEoNa23yeSHD5IqmF4Gy/Y7nujjr7d4gU412cW99ZhOHKSOIGJ9ahAmPW+ENZQLvAWnul/e00AfFKlfiU2kcgTfEF6b2HJQi0ayruTiyC+uTAOkQCatLqKUs510Duiwp3PoWxJn3BZnrBmJv22Y1978HXI1aVD6nwT0S4r45ncWQ7FaeYuF8feK16A6kE7tKXcO5H9vrbSpqo77NOL 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)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:53:17.7875 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 21cc831e-aa56-4fa0-7302-08dc3cfa1562 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: SJ5PEPF000001D4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8657 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/24. 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=bbba917213589deeedba18ad5671c4733cf0134e Thanks. Xueming Li --- >From bbba917213589deeedba18ad5671c4733cf0134e Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 5 Dec 2023 10:45:31 +0100 Subject: [PATCH] vhost: fix virtqueue access check in datapath Cc: Xueming Li [ upstream commit 9fc93a1e23203e3053f5acc198e9203bc49024b5 ] Now that a r/w lock is used, the access_ok field should only be updated under a write lock. Since the datapath code only takes a read lock on the virtqueue to check access_ok, this lock must be released and a write lock taken before calling vring_translate(). Fixes: 03f77d66d966 ("vhost: change virtqueue access lock to a read/write one") Signed-off-by: David Marchand Acked-by: Eelco Chaudron Reviewed-by: Maxime Coquelin --- lib/vhost/virtio_net.c | 60 +++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c index 8af20f1487..d00f4b03aa 100644 --- a/lib/vhost/virtio_net.c +++ b/lib/vhost/virtio_net.c @@ -1696,6 +1696,17 @@ virtio_dev_rx_packed(struct virtio_net *dev, return pkt_idx; } +static void +virtio_dev_vring_translate(struct virtio_net *dev, struct vhost_virtqueue *vq) +{ + rte_rwlock_write_lock(&vq->access_lock); + vhost_user_iotlb_rd_lock(vq); + if (!vq->access_ok) + vring_translate(dev, vq); + vhost_user_iotlb_rd_unlock(vq); + rte_rwlock_write_unlock(&vq->access_lock); +} + static __rte_always_inline uint32_t virtio_dev_rx(struct virtio_net *dev, struct vhost_virtqueue *vq, struct rte_mbuf **pkts, uint32_t count) @@ -1710,9 +1721,13 @@ virtio_dev_rx(struct virtio_net *dev, struct vhost_virtqueue *vq, vhost_user_iotlb_rd_lock(vq); - if (unlikely(!vq->access_ok)) - if (unlikely(vring_translate(dev, vq) < 0)) - goto out; + if (unlikely(!vq->access_ok)) { + vhost_user_iotlb_rd_unlock(vq); + rte_rwlock_read_unlock(&vq->access_lock); + + virtio_dev_vring_translate(dev, vq); + goto out_no_unlock; + } count = RTE_MIN((uint32_t)MAX_PKT_BURST, count); if (count == 0) @@ -1731,6 +1746,7 @@ out: out_access_unlock: rte_rwlock_read_unlock(&vq->access_lock); +out_no_unlock: return nb_tx; } @@ -2528,9 +2544,13 @@ virtio_dev_rx_async_submit(struct virtio_net *dev, struct vhost_virtqueue *vq, vhost_user_iotlb_rd_lock(vq); - if (unlikely(!vq->access_ok)) - if (unlikely(vring_translate(dev, vq) < 0)) - goto out; + if (unlikely(!vq->access_ok)) { + vhost_user_iotlb_rd_unlock(vq); + rte_rwlock_read_unlock(&vq->access_lock); + + virtio_dev_vring_translate(dev, vq); + goto out_no_unlock; + } count = RTE_MIN((uint32_t)MAX_PKT_BURST, count); if (count == 0) @@ -2551,6 +2571,7 @@ out: out_access_unlock: rte_rwlock_write_unlock(&vq->access_lock); +out_no_unlock: return nb_tx; } @@ -3581,11 +3602,13 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id, vhost_user_iotlb_rd_lock(vq); - if (unlikely(!vq->access_ok)) - if (unlikely(vring_translate(dev, vq) < 0)) { - count = 0; - goto out; - } + if (unlikely(!vq->access_ok)) { + vhost_user_iotlb_rd_unlock(vq); + rte_rwlock_read_unlock(&vq->access_lock); + + virtio_dev_vring_translate(dev, vq); + goto out_no_unlock; + } /* * Construct a RARP broadcast packet, and inject it to the "pkts" @@ -3646,6 +3669,7 @@ out_access_unlock: if (unlikely(rarp_mbuf != NULL)) count += 1; +out_no_unlock: return count; } @@ -4196,11 +4220,14 @@ rte_vhost_async_try_dequeue_burst(int vid, uint16_t queue_id, vhost_user_iotlb_rd_lock(vq); - if (unlikely(vq->access_ok == 0)) - if (unlikely(vring_translate(dev, vq) < 0)) { - count = 0; - goto out; - } + if (unlikely(vq->access_ok == 0)) { + vhost_user_iotlb_rd_unlock(vq); + rte_rwlock_read_unlock(&vq->access_lock); + + virtio_dev_vring_translate(dev, vq); + count = 0; + goto out_no_unlock; + } /* * Construct a RARP broadcast packet, and inject it to the "pkts" @@ -4266,5 +4293,6 @@ out_access_unlock: if (unlikely(rarp_mbuf != NULL)) count += 1; +out_no_unlock: return count; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.640555955 +0800 +++ 0055-vhost-fix-virtqueue-access-check-in-datapath.patch 2024-03-05 17:39:30.763566493 +0800 @@ -1 +1 @@ -From 9fc93a1e23203e3053f5acc198e9203bc49024b5 Mon Sep 17 00:00:00 2001 +From bbba917213589deeedba18ad5671c4733cf0134e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9fc93a1e23203e3053f5acc198e9203bc49024b5 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 280d4845f8..c738b7edc9 100644 +index 8af20f1487..d00f4b03aa 100644