patch 'net/virtio-user: fix control queue allocation' has been queued to stable release 23.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.2

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

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 76310fc7c1ccf9296e30baabf7eb13d4e5067623 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Thu, 28 Mar 2024 14:08:13 +0100
Subject: [PATCH] net/virtio-user: fix control queue allocation
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit b80947743f5ebee74e2d03ece9d5a9826edde968 ]

It is possible to have the control queue without the
device advertising VIRTIO_NET_F_MQ.

Rely on the VIRTIO_NET_F_CTRL_VQ feature being advertised
instead.

Fixes: 6fdf32d1e318 ("net/virtio-user: remove max queues limitation")

Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index ef320d3395..209435a865 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -20,6 +20,7 @@
 #include <rte_malloc.h>
 
 #include "vhost.h"
+#include "virtio.h"
 #include "virtio_user_dev.h"
 #include "../virtio_ethdev.h"
 
@@ -608,7 +609,7 @@ virtio_user_alloc_vrings(struct virtio_user_dev *dev)
 	bool packed_ring = !!(dev->device_features & (1ull << VIRTIO_F_RING_PACKED));
 
 	nr_vrings = dev->max_queue_pairs * 2;
-	if (dev->device_features & (1ull << VIRTIO_NET_F_MQ))
+	if (dev->device_features & (1ull << VIRTIO_NET_F_CTRL_VQ))
 		nr_vrings++;
 
 	dev->callfds = rte_zmalloc("virtio_user_dev", nr_vrings * sizeof(*dev->callfds), 0);
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-07-12 18:40:16.727094612 +0800
+++ 0055-net-virtio-user-fix-control-queue-allocation.patch	2024-07-12 18:40:14.106594227 +0800
@@ -1 +1 @@
-From b80947743f5ebee74e2d03ece9d5a9826edde968 Mon Sep 17 00:00:00 2001
+From 76310fc7c1ccf9296e30baabf7eb13d4e5067623 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit b80947743f5ebee74e2d03ece9d5a9826edde968 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -22 +24 @@
-index ba067d6d9c..1365c8a5c8 100644
+index ef320d3395..209435a865 100644
@@ -25,2 +27,2 @@
-@@ -21,6 +21,7 @@
- #include <rte_io.h>
+@@ -20,6 +20,7 @@
+ #include <rte_malloc.h>
@@ -33 +35 @@
-@@ -615,7 +616,7 @@ virtio_user_alloc_vrings(struct virtio_user_dev *dev)
+@@ -608,7 +609,7 @@ virtio_user_alloc_vrings(struct virtio_user_dev *dev)