[dpdk-stable] patch 'net/virtio-user: fix multiple queue for vhost-kernel' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.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 11/26/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 52d21556f0890247a4dddcfcfffb01e4bc3a0070 Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Fri, 21 Sep 2018 20:52:42 +0800
Subject: [PATCH] net/virtio-user: fix multiple queue for vhost-kernel

[ upstream commit 21b90f790a5fd41875610440b888015aa9b0a460 ]

The multiple queue support in vhost-kernel is broken because
the dev->vhostfd is only available for vhost-user. We should
always try to enable queue pairs when it's not in server mode.

Fixes: 201a41651715 ("net/virtio-user: fix multiple queues fail in server mode")

Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 869e96f87..55a82e4b0 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -550,11 +550,9 @@ virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pairs)
 	 * always return 0 in this case.
 	 */
-	if (dev->vhostfd >= 0) {
+	if (!dev->is_server || dev->vhostfd >= 0) {
 		for (i = 0; i < q_pairs; ++i)
 			ret |= dev->ops->enable_qp(dev, i, 1);
 		for (i = q_pairs; i < dev->max_queue_pairs; ++i)
 			ret |= dev->ops->enable_qp(dev, i, 0);
-	} else if (!dev->is_server) {
-		ret = ~0;
 	}
 	dev->queue_pairs = q_pairs;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 15:59:14.517228661 +0000
+++ 0035-net-virtio-user-fix-multiple-queue-for-vhost-kernel.patch	2018-11-21 15:59:13.000000000 +0000
@@ -1,14 +1,15 @@
-From 21b90f790a5fd41875610440b888015aa9b0a460 Mon Sep 17 00:00:00 2001
+From 52d21556f0890247a4dddcfcfffb01e4bc3a0070 Mon Sep 17 00:00:00 2001
 From: Tiwei Bie <tiwei.bie at intel.com>
 Date: Fri, 21 Sep 2018 20:52:42 +0800
 Subject: [PATCH] net/virtio-user: fix multiple queue for vhost-kernel
 
+[ upstream commit 21b90f790a5fd41875610440b888015aa9b0a460 ]
+
 The multiple queue support in vhost-kernel is broken because
 the dev->vhostfd is only available for vhost-user. We should
 always try to enable queue pairs when it's not in server mode.
 
 Fixes: 201a41651715 ("net/virtio-user: fix multiple queues fail in server mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>