[dpdk-stable] patch 'net/virtio: reject deferred Tx 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 2232241936628e186a11d3895f2c178f2b6b65e6 Mon Sep 17 00:00:00 2001
From: Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
Date: Wed, 9 Oct 2019 13:32:06 +0100
Subject: [PATCH] net/virtio: reject deferred Tx start

[ upstream commit c0e03310ee90c5d7aff9fffb243f3374f0b0cd61 ]

Deferred start Tx 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: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_rxtx.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 90bc2c2298..2d00a9444e 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -538,6 +538,11 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
 
 	PMD_INIT_FUNC_TRACE();
 
+	if (tx_conf->tx_deferred_start) {
+		PMD_INIT_LOG(ERR, "Tx deferred start is not supported");
+		return -EINVAL;
+	}
+
 	/* cannot use simple rxtx funcs with multisegs or offloads */
 	if ((tx_conf->txq_flags & VIRTIO_SIMPLE_FLAGS) != VIRTIO_SIMPLE_FLAGS)
 		hw->use_simple_tx = 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:29.745141682 +0000
+++ 0085-net-virtio-reject-deferred-Tx-start.patch	2019-12-19 14:32:26.205299809 +0000
@@ -1,12 +1,13 @@
-From c0e03310ee90c5d7aff9fffb243f3374f0b0cd61 Mon Sep 17 00:00:00 2001
+From 2232241936628e186a11d3895f2c178f2b6b65e6 Mon Sep 17 00:00:00 2001
 From: Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
 Date: Wed, 9 Oct 2019 13:32:06 +0100
 Subject: [PATCH] net/virtio: reject deferred Tx start
 
+[ upstream commit c0e03310ee90c5d7aff9fffb243f3374f0b0cd61 ]
+
 Deferred start Tx 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>
@@ -17,10 +18,10 @@
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
-index 405c313f20..0959250a33 100644
+index 90bc2c2298..2d00a9444e 100644
 --- a/drivers/net/virtio/virtio_rxtx.c
 +++ b/drivers/net/virtio/virtio_rxtx.c
-@@ -1067,6 +1067,11 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
+@@ -538,6 +538,11 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
  
  	PMD_INIT_FUNC_TRACE();
  
@@ -29,9 +30,9 @@
 +		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);
+ 	/* cannot use simple rxtx funcs with multisegs or offloads */
+ 	if ((tx_conf->txq_flags & VIRTIO_SIMPLE_FLAGS) != VIRTIO_SIMPLE_FLAGS)
+ 		hw->use_simple_tx = 0;
 -- 
 2.20.1