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 569FFA034F for ; Tue, 1 Mar 2022 11:44:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F98C426E8; Tue, 1 Mar 2022 11:44:59 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id F100E426EB for ; Tue, 1 Mar 2022 11:44:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131497; 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=OBWQNei0qGzKFjUni/L528k4CXW9KHmmeLSoO0NeWCE=; b=Nqwhr/pwuzKUR8/QN/ndwqWsnVsEjhG/oxrHJTli0Rlna36WxF+YY0PnUqz2MploHjAQ6W xtpdNtSTVX8M/DVh76WnKA7AyTZ4EU5LT8a2d4ndYHwH9n7aRwHAMvzyWqIn4xQkuzyYoW D787SddV6m6qr3lQ+FES/+WHUV9rTxg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-64-2oFLT4MMN8myDIi9HCF03w-1; Tue, 01 Mar 2022 05:44:54 -0500 X-MC-Unique: 2oFLT4MMN8myDIi9HCF03w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3C50100C611; Tue, 1 Mar 2022 10:44:53 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7746A6FB02; Tue, 1 Mar 2022 10:44:52 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Chenbo Xia , David Marchand , dpdk stable Subject: patch 'vhost: fix unsafe vring addresses modifications' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:05 +0000 Message-Id: <20220301104300.334382-49-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.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/06/22. 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/87b639b4ed00c813627c5ce39d3eda8945d4a62d Thanks. Kevin --- >From 87b639b4ed00c813627c5ce39d3eda8945d4a62d Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 27 Jan 2022 12:09:53 +0100 Subject: [PATCH] vhost: fix unsafe vring addresses modifications [ upstream commit 04c27cb673b983ce2580731c0afc4b0e815fd658 ] This patch adds missing protection around vring_invalidate and translate_ring_addresses calls in vhost_user_iotlb_msg. Fixes: eefac9536a90 ("vhost: postpone device creation until rings are mapped") Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia Reviewed-by: David Marchand --- lib/vhost/vhost_user.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 14ba3365c7..f8ca03835f 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2567,6 +2567,9 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg, len, imsg->perm); - if (is_vring_iotlb(dev, vq, imsg)) + if (is_vring_iotlb(dev, vq, imsg)) { + rte_spinlock_lock(&vq->access_lock); *pdev = dev = translate_ring_addresses(dev, i); + rte_spinlock_unlock(&vq->access_lock); + } } break; @@ -2581,6 +2584,9 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg, imsg->size); - if (is_vring_iotlb(dev, vq, imsg)) + if (is_vring_iotlb(dev, vq, imsg)) { + rte_spinlock_lock(&vq->access_lock); vring_invalidate(dev, vq); + rte_spinlock_unlock(&vq->access_lock); + } } break; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:02.709305339 +0000 +++ 0049-vhost-fix-unsafe-vring-addresses-modifications.patch 2022-03-01 10:41:01.333244104 +0000 @@ -1 +1 @@ -From 04c27cb673b983ce2580731c0afc4b0e815fd658 Mon Sep 17 00:00:00 2001 +From 87b639b4ed00c813627c5ce39d3eda8945d4a62d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 04c27cb673b983ce2580731c0afc4b0e815fd658 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 8ee9c3e2db..723c6890c3 100644 +index 14ba3365c7..f8ca03835f 100644 @@ -23 +24 @@ -@@ -2565,6 +2565,9 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, +@@ -2567,6 +2567,9 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg, @@ -34 +35 @@ -@@ -2579,6 +2582,9 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, +@@ -2581,6 +2584,9 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,