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

Kevin Traynor ktraynor at redhat.com
Tue Dec 10 15:59:01 CET 2019


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/3a1d14413a19c65e8a5b42ec131de319f8e08c03

Thanks.

Kevin.

---
>From 3a1d14413a19c65e8a5b42ec131de319f8e08c03 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 0fface207..c7df33829 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -556,5 +556,5 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
 			uint16_t nb_desc,
 			unsigned int socket_id __rte_unused,
-			const struct rte_eth_rxconf *rx_conf __rte_unused,
+			const struct rte_eth_rxconf *rx_conf,
 			struct rte_mempool *mp)
 {
@@ -566,4 +566,9 @@ 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;
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:40.950105941 +0000
+++ 0027-net-virtio-reject-deferred-Rx-start.patch	2019-12-10 14:49:39.036458066 +0000
@@ -1 +1 @@
-From 955d7c1f03d049b2018db3d2c4a78920368d7aa3 Mon Sep 17 00:00:00 2001
+From 3a1d14413a19c65e8a5b42ec131de319f8e08c03 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 955d7c1f03d049b2018db3d2c4a78920368d7aa3 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index b5fc4ecbe..405c313f2 100644
+index 0fface207..c7df33829 100644
@@ -22 +23 @@
-@@ -930,5 +930,5 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -556,5 +556,5 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
@@ -29 +30 @@
-@@ -940,4 +940,9 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -566,4 +566,9 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,



More information about the stable mailing list