patch 'vhost: fix deadlock in Rx async path' has been queued to stable release 23.11.3

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/10/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=37f8c86e53d081589faa324c6d6b034e1752014e

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 37f8c86e53d081589faa324c6d6b034e1752014e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Mon, 18 Nov 2024 08:24:24 -0800
Subject: [PATCH] vhost: fix deadlock in Rx async path
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 22aa9a9c7099e1f4b297899c33b4fea1131d3ac7 ]

If lock is acquired for write, it must be released for write
or a deadlock is likely.

Bugzilla ID: 1582
Fixes: 9fc93a1e2320 ("vhost: fix virtqueue access check in datapath")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/vhost/virtio_net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
index 6d53ff932d..5ec89719c6 100644
--- a/lib/vhost/virtio_net.c
+++ b/lib/vhost/virtio_net.c
@@ -2546,7 +2546,7 @@ virtio_dev_rx_async_submit(struct virtio_net *dev, struct vhost_virtqueue *vq,

 	if (unlikely(!vq->access_ok)) {
 		vhost_user_iotlb_rd_unlock(vq);
-		rte_rwlock_read_unlock(&vq->access_lock);
+		rte_rwlock_write_unlock(&vq->access_lock);

 		virtio_dev_vring_translate(dev, vq);
 		goto out_no_unlock;
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-12-06 23:26:46.932850606 +0800
+++ 0085-vhost-fix-deadlock-in-Rx-async-path.patch	2024-12-06 23:26:44.093044826 +0800
@@ -1 +1 @@
-From 22aa9a9c7099e1f4b297899c33b4fea1131d3ac7 Mon Sep 17 00:00:00 2001
+From 37f8c86e53d081589faa324c6d6b034e1752014e Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 22aa9a9c7099e1f4b297899c33b4fea1131d3ac7 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 298a5dae74..d764d4bc6a 100644
+index 6d53ff932d..5ec89719c6 100644
@@ -23 +25 @@
-@@ -2538,7 +2538,7 @@ virtio_dev_rx_async_submit(struct virtio_net *dev, struct vhost_virtqueue *vq,
+@@ -2546,7 +2546,7 @@ virtio_dev_rx_async_submit(struct virtio_net *dev, struct vhost_virtqueue *vq,