[dpdk-stable] patch 'net/virtio: reject unsupported Rx multi-queue modes' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 12/16/19. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/20accec1aa2a33845dbac155b96181b68927e75e

Thanks.

Kevin.

---
>From 20accec1aa2a33845dbac155b96181b68927e75e Mon Sep 17 00:00:00 2001
From: Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
Date: Wed, 9 Oct 2019 13:32:07 +0100
Subject: [PATCH] net/virtio: reject unsupported Rx multi-queue modes

[ upstream commit 13b3137f3b7c8f866947a9b34e06a8aec0d084f7 ]

This driver supports none of DCB, RSS or VMDQ modes, therefore must
check and return error if configured incorrectly.

Virtio can distribute Rx packets across multi-queue, but there is
no controls (algorithm, redirection table, hash function) except
number of Rx queues and ETH_MQ_RX_NONE is the best fit meaning
no method is enforced on how to route packets to MQs.

Fixes: c1f86306a026 ("virtio: add new driver")

Signed-off-by: Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_ethdev.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 8c54edc28..634e56817 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1867,4 +1867,11 @@ virtio_dev_configure(struct rte_eth_dev *dev)
 	req_features = VIRTIO_PMD_DEFAULT_GUEST_FEATURES;
 
+	if (rxmode->mq_mode != ETH_MQ_RX_NONE) {
+		PMD_DRV_LOG(ERR,
+			"Unsupported Rx multi queue mode %d",
+			rxmode->mq_mode);
+		return -EINVAL;
+	}
+
 	if (dev->data->dev_conf.intr_conf.rxq) {
 		ret = virtio_init_device(dev, hw->req_guest_features);
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:41.083295473 +0000
+++ 0029-net-virtio-reject-unsupported-Rx-multi-queue-modes.patch	2019-12-10 14:49:39.040457991 +0000
@@ -1 +1 @@
-From 13b3137f3b7c8f866947a9b34e06a8aec0d084f7 Mon Sep 17 00:00:00 2001
+From 20accec1aa2a33845dbac155b96181b68927e75e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 13b3137f3b7c8f866947a9b34e06a8aec0d084f7 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 0a2ed2e50..76bd40a3e 100644
+index 8c54edc28..634e56817 100644
@@ -28 +29 @@
-@@ -2067,4 +2067,11 @@ virtio_dev_configure(struct rte_eth_dev *dev)
+@@ -1867,4 +1867,11 @@ virtio_dev_configure(struct rte_eth_dev *dev)