patch 'vhost: fix virtqueue access check in vhost-user setup' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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/11/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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/7293e69ddf77c3ed83f1e14ab3a96f13d2ff144b

Thanks.

Kevin

---
>From 7293e69ddf77c3ed83f1e14ab3a96f13d2ff144b Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 5 Dec 2023 10:45:33 +0100
Subject: [PATCH] vhost: fix virtqueue access check in vhost-user setup

[ upstream commit b3e42d92362bcc75df21c5b86ba7c0685b40a3bf ]

Calling vring_invalidate must be done with a (write) lock taken on the
virtqueue.

Fixes: 72d002b3ebda ("vhost: fix vring address handling during live migration")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Eelco Chaudron <echaudro at redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/vhost/vhost_user.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index bf489cb13b..af0062dd1f 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -2190,5 +2190,7 @@ vhost_user_get_vring_base(struct virtio_net **pdev,
 	vhost_user_iotlb_flush_all(vq);
 
+	rte_spinlock_lock(&vq->access_lock);
 	vring_invalidate(dev, vq);
+	rte_spinlock_unlock(&vq->access_lock);
 
 	return RTE_VHOST_MSG_RESULT_REPLY;
-- 
2.43.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-05 14:08:55.338989180 +0000
+++ 0027-vhost-fix-virtqueue-access-check-in-vhost-user-setup.patch	2024-03-05 14:08:54.642520744 +0000
@@ -1 +1 @@
-From b3e42d92362bcc75df21c5b86ba7c0685b40a3bf Mon Sep 17 00:00:00 2001
+From 7293e69ddf77c3ed83f1e14ab3a96f13d2ff144b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b3e42d92362bcc75df21c5b86ba7c0685b40a3bf ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index bac10e6182..931dc690ad 100644
+index bf489cb13b..af0062dd1f 100644
@@ -23,2 +24,2 @@
-@@ -2199,5 +2199,7 @@ vhost_user_get_vring_base(struct virtio_net **pdev,
- 	vhost_user_iotlb_flush_all(dev);
+@@ -2190,5 +2190,7 @@ vhost_user_get_vring_base(struct virtio_net **pdev,
+ 	vhost_user_iotlb_flush_all(vq);
@@ -26 +27 @@
-+	rte_rwlock_write_lock(&vq->access_lock);
++	rte_spinlock_lock(&vq->access_lock);
@@ -28 +29 @@
-+	rte_rwlock_write_unlock(&vq->access_lock);
++	rte_spinlock_unlock(&vq->access_lock);