patch 'vhost: fix check on virtqueue access in in-flight getter' has been queued to stable release 21.11.6

[Kevin Traynor <ktraynor@redhat.com>]

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/587aea0f91f7170f6812d248915f0c60aed3057d

Thanks.

Kevin

---
From 587aea0f91f7170f6812d248915f0c60aed3057d Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Fri, 20 Oct 2023 10:48:02 +0200
Subject: [PATCH] vhost: fix check on virtqueue access in in-flight getter

[ upstream commit 288cd1f8ca3ebaf20aeed92966da9020a5793852 ]

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: 0c0935c5f794 ("vhost: allow to check in-flight packets for async vhost")

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Acked-by: David Marchand <david.marchand@redhat.com>
---
 lib/vhost/vhost.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
index 038baf53fd..8a20efa7c4 100644
--- a/lib/vhost/vhost.c
+++ b/lib/vhost/vhost.c
@@ -1930,7 +1930,13 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id)
 	}
 
+	if (unlikely(!vq->access_ok)) {
+		ret = -1;
+		goto out_unlock;
+	}
+
 	if (vq->async)
 		ret = vq->async->pkts_inflight_n;
 
+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.776415453 +0000
+++ 0008-vhost-fix-check-on-virtqueue-access-in-in-flight-get.patch	2023-11-16 13:21:52.402946235 +0000
@@ -1 +1 @@
-From 288cd1f8ca3ebaf20aeed92966da9020a5793852 Mon Sep 17 00:00:00 2001
+From 587aea0f91f7170f6812d248915f0c60aed3057d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 288cd1f8ca3ebaf20aeed92966da9020a5793852 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 53318a54a3..f86516324b 100644
+index 038baf53fd..8a20efa7c4 100644
@@ -24 +25 @@
-@@ -2076,7 +2076,13 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id)
+@@ -1930,7 +1930,13 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id)
@@ -36 +37 @@
- 	rte_rwlock_write_unlock(&vq->access_lock);
+ 	rte_spinlock_unlock(&vq->access_lock);