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 CE2CC43345 for ; Thu, 16 Nov 2023 14:24:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C83E2402E0; Thu, 16 Nov 2023 14:24:09 +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 5B342402B7 for ; Thu, 16 Nov 2023 14:24:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141047; 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=ae/Z9LB1gbTss/cOLpPn7DBeIOyF+vfiK3OaN1Y8578=; b=ZSTOD868ZVTRbDiNR5L1djDRUJd9YO1fD5wpvXoEJsTjRALCDFv+7AJR8ZOdjRfziIL+Df LO+I5KNjGVJE1RCs+DOibcnH+9gKDjt/DJD+fYTpsYvYP/CPG/dbHAfr5vwS9BrXcx+sL8 XnVC6vWXJgKibb225HYC5yFeUzM2qt8= 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-221-OoFPj73gNbeZ5TIRJDb6Zg-1; Thu, 16 Nov 2023 08:24:06 -0500 X-MC-Unique: OoFPj73gNbeZ5TIRJDb6Zg-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 13FA9101A52D; Thu, 16 Nov 2023 13:24:06 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id B18B32166B27; Thu, 16 Nov 2023 13:24:04 +0000 (UTC) From: Kevin Traynor 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 21.11.6 Date: Thu, 16 Nov 2023 13:22:47 +0000 Message-ID: <20231116132348.557257-5-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/e9b6f56c9c122f1d9ea5be3dbde32a1eed318c59 Thanks. Kevin --- >From e9b6f56c9c122f1d9ea5be3dbde32a1eed318c59 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 [ 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 86672fcc33..c72c9aa40e 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1288,4 +1288,5 @@ 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); @@ -1302,4 +1303,9 @@ 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); @@ -1307,7 +1313,8 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) vhost_vring_call_split(dev, vq); +out_unlock: rte_spinlock_unlock(&vq->access_lock); - return 0; + return ret; } @@ -1317,4 +1324,5 @@ 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); @@ -1332,4 +1340,9 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) return -EAGAIN; + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) vhost_vring_call_packed(dev, vq); @@ -1337,7 +1350,8 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) vhost_vring_call_split(dev, vq); +out_unlock: rte_spinlock_unlock(&vq->access_lock); - return 0; + return ret; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:52.712011280 +0000 +++ 0005-vhost-fix-missing-vring-call-check-on-virtqueue-acce.patch 2023-11-16 13:21:52.398946223 +0000 @@ -1 +1 @@ -From af7f683615244675fc4f472a2aa42880896476ad Mon Sep 17 00:00:00 2001 +From e9b6f56c9c122f1d9ea5be3dbde32a1eed318c59 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit af7f683615244675fc4f472a2aa42880896476ad ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index bdcf85bece..b438330063 100644 +index 86672fcc33..c72c9aa40e 100644 @@ -27 +28 @@ -@@ -1333,4 +1333,5 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) +@@ -1288,4 +1288,5 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) @@ -33,2 +34,2 @@ -@@ -1347,4 +1348,9 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) - rte_rwlock_read_lock(&vq->access_lock); +@@ -1302,4 +1303,9 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) + rte_spinlock_lock(&vq->access_lock); @@ -43 +44 @@ -@@ -1352,7 +1358,8 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) +@@ -1307,7 +1313,8 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) @@ -47 +48 @@ - rte_rwlock_read_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock); @@ -53 +54 @@ -@@ -1362,4 +1369,5 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) +@@ -1317,4 +1324,5 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) @@ -59 +60 @@ -@@ -1377,4 +1385,9 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) +@@ -1332,4 +1340,9 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) @@ -69 +70 @@ -@@ -1382,7 +1395,8 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) +@@ -1337,7 +1350,8 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) @@ -73 +74 @@ - rte_rwlock_read_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock);