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 6AB9343345 for ; Thu, 16 Nov 2023 14:24:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 64C6F402DD; Thu, 16 Nov 2023 14:24:16 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 2D29C402C6 for ; Thu, 16 Nov 2023 14:24:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KutnXcn8ugIWTgGuaD40wyOT3Krrl5cLgVq5RtR6OFQ=; b=BaiYnBWqRHcW+UxWDwS7VOloLEw9TOs/O1W85SaxIb459aBFjxE4GbKM9pW7LVojPDqudo c17RpmddQzRx13ratg7PRX953ysny56OAuNqwwsnGpC4fGgNW06+Hdu2CfRTxODY7ZNqQR dZaS2te1hciJqKYf4nweW80kp+QBnHo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-347-DLSWr3kZNXKo8fLlyV1THQ-1; Thu, 16 Nov 2023 08:24:09 -0500 X-MC-Unique: DLSWr3kZNXKo8fLlyV1THQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CD65B811E7B for ; Thu, 16 Nov 2023 13:24:08 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBD4C2166B27; Thu, 16 Nov 2023 13:24:07 +0000 (UTC) From: Kevin Traynor 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 21.11.6 Date: Thu, 16 Nov 2023 13:22:49 +0000 Message-ID: <20231116132348.557257-7-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/201e1f617be367c49d95579f803931121a123069 Thanks. Kevin --- >From 201e1f617be367c49d95579f803931121a123069 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 [ 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 45e34e0df1..038baf53fd 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1783,5 +1783,13 @@ rte_vhost_async_channel_register(int vid, uint16_t queue_id, rte_spinlock_lock(&vq->access_lock); + + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + ret = async_channel_register(vid, queue_id, ops); + +out_unlock: rte_spinlock_unlock(&vq->access_lock); @@ -1846,4 +1854,9 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) } + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (!vq->async) { ret = 0; @@ -1856,4 +1869,5 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) } +out_unlock: rte_spinlock_unlock(&vq->access_lock); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:52.755227668 +0000 +++ 0007-vhost-fix-check-on-virtqueue-access-in-async-registr.patch 2023-11-16 13:21:52.401946232 +0000 @@ -1 +1 @@ -From 867d31bed41c87510e860956ee6a67c047d98f87 Mon Sep 17 00:00:00 2001 +From 201e1f617be367c49d95579f803931121a123069 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 867d31bed41c87510e860956ee6a67c047d98f87 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index f7e5602913..53318a54a3 100644 +index 45e34e0df1..038baf53fd 100644 @@ -24 +25 @@ -@@ -1860,5 +1860,13 @@ rte_vhost_async_channel_register(int vid, uint16_t queue_id) +@@ -1783,5 +1783,13 @@ rte_vhost_async_channel_register(int vid, uint16_t queue_id, @@ -26 +27 @@ - rte_rwlock_write_lock(&vq->access_lock); + rte_spinlock_lock(&vq->access_lock); @@ -33 +34 @@ - ret = async_channel_register(dev, vq); + ret = async_channel_register(vid, queue_id, ops); @@ -36 +37 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock); @@ -38 +39 @@ -@@ -1912,4 +1920,9 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) +@@ -1846,4 +1854,9 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) @@ -48 +49 @@ -@@ -1923,4 +1936,5 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) +@@ -1856,4 +1869,5 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) @@ -52 +53 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock);