[dpdk-stable] patch 'net/virtio: reject deferred Rx start' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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/21/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.

Thanks.

Luca Boccassi

---
>From 4ffa05031dc3ef78fc6037472e34fd6e520a56b3 Mon Sep 17 00:00:00 2001
From: Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
Date: Wed, 9 Oct 2019 13:32:05 +0100
Subject: [PATCH] net/virtio: reject deferred Rx start

[ upstream commit 955d7c1f03d049b2018db3d2c4a78920368d7aa3 ]

Deferred start Rx queue is not supported by the driver.

Fixes: 0748be2cf9a2 ("ethdev: queue start and stop")

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_rxtx.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index c608575722..90bc2c2298 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -421,7 +421,7 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
 			uint16_t queue_idx,
 			uint16_t nb_desc,
 			unsigned int socket_id __rte_unused,
-			__rte_unused const struct rte_eth_rxconf *rx_conf,
+			const struct rte_eth_rxconf *rx_conf,
 			struct rte_mempool *mp)
 {
 	uint16_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_RQ_QUEUE_IDX;
@@ -431,6 +431,11 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
 
 	PMD_INIT_FUNC_TRACE();
 
+	if (rx_conf->rx_deferred_start) {
+		PMD_INIT_LOG(ERR, "Rx deferred start is not supported");
+		return -EINVAL;
+	}
+
 	if (nb_desc == 0 || nb_desc > vq->vq_nentries)
 		nb_desc = vq->vq_nentries;
 	vq->vq_free_cnt = RTE_MIN(vq->vq_free_cnt, nb_desc);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:29.707626710 +0000
+++ 0084-net-virtio-reject-deferred-Rx-start.patch	2019-12-19 14:32:26.201299729 +0000
@@ -1,12 +1,13 @@
-From 955d7c1f03d049b2018db3d2c4a78920368d7aa3 Mon Sep 17 00:00:00 2001
+From 4ffa05031dc3ef78fc6037472e34fd6e520a56b3 Mon Sep 17 00:00:00 2001
 From: Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
 Date: Wed, 9 Oct 2019 13:32:05 +0100
 Subject: [PATCH] net/virtio: reject deferred Rx start
 
+[ upstream commit 955d7c1f03d049b2018db3d2c4a78920368d7aa3 ]
+
 Deferred start Rx queue is not supported by the driver.
 
 Fixes: 0748be2cf9a2 ("ethdev: queue start and stop")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -16,19 +17,19 @@
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
-index b5fc4ecbe1..405c313f20 100644
+index c608575722..90bc2c2298 100644
 --- a/drivers/net/virtio/virtio_rxtx.c
 +++ b/drivers/net/virtio/virtio_rxtx.c
-@@ -929,7 +929,7 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -421,7 +421,7 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
  			uint16_t queue_idx,
  			uint16_t nb_desc,
  			unsigned int socket_id __rte_unused,
--			const struct rte_eth_rxconf *rx_conf __rte_unused,
+-			__rte_unused const struct rte_eth_rxconf *rx_conf,
 +			const struct rte_eth_rxconf *rx_conf,
  			struct rte_mempool *mp)
  {
  	uint16_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_RQ_QUEUE_IDX;
-@@ -939,6 +939,11 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -431,6 +431,11 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
  
  	PMD_INIT_FUNC_TRACE();