[dpdk-stable] patch 'net/virtio: reject unsupported Tx 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/9b86e7fb843021c6ddbcc5a2fe46e685968893b8

Thanks.

Kevin.

---
>From 9b86e7fb843021c6ddbcc5a2fe46e685968893b8 Mon Sep 17 00:00:00 2001
From: Andrew Rybchenko <arybchenko at solarflare.com>
Date: Wed, 9 Oct 2019 13:32:08 +0100
Subject: [PATCH] net/virtio: reject unsupported Tx multi-queue modes

[ upstream commit 9fc963acc26f31c46e4c7f8527b60fa2e5505f8f ]

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

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

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 634e56817..2d4c6c7fa 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1874,4 +1874,11 @@ virtio_dev_configure(struct rte_eth_dev *dev)
 	}
 
+	if (txmode->mq_mode != ETH_MQ_TX_NONE) {
+		PMD_DRV_LOG(ERR,
+			"Unsupported Tx multi queue mode %d",
+			txmode->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.145399449 +0000
+++ 0030-net-virtio-reject-unsupported-Tx-multi-queue-modes.patch	2019-12-10 14:49:39.044457917 +0000
@@ -1 +1 @@
-From 9fc963acc26f31c46e4c7f8527b60fa2e5505f8f Mon Sep 17 00:00:00 2001
+From 9b86e7fb843021c6ddbcc5a2fe46e685968893b8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9fc963acc26f31c46e4c7f8527b60fa2e5505f8f ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 76bd40a3e..646de9945 100644
+index 634e56817..2d4c6c7fa 100644
@@ -22 +23 @@
-@@ -2074,4 +2074,11 @@ virtio_dev_configure(struct rte_eth_dev *dev)
+@@ -1874,4 +1874,11 @@ virtio_dev_configure(struct rte_eth_dev *dev)