patch 'net/virtio: fix Rx and Tx queue state' has been queued to stable release 21.11.6

Kevin Traynor ktraynor at redhat.com
Thu Nov 2 14:12:45 CET 2023


Hi,

FYI, your patch has been queued to stable release 21.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 11/08/23. 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

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

Thanks.

Kevin

---
>From a508510366ea6eed6e2b74a6177ccb142b34e8ce Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1 at huawei.com>
Date: Fri, 8 Sep 2023 19:28:59 +0800
Subject: [PATCH] net/virtio: fix Rx and Tx queue state

[ upstream commit 0170be6f4f90fdf3295c23520fc1547c1a2405db ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1 at huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 drivers/net/virtio/virtio_ethdev.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index f4d13ec3a1..a23559850c 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -2853,4 +2853,9 @@ virtio_dev_start(struct rte_eth_dev *dev)
 	hw->started = 1;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	/* Initialize Link state */
 	virtio_dev_link_update(dev, 0);
@@ -2942,4 +2947,5 @@ virtio_dev_stop(struct rte_eth_dev *dev)
 	struct rte_eth_link link;
 	struct rte_eth_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf;
+	uint16_t i;
 
 	PMD_INIT_LOG(DEBUG, "stop");
@@ -2969,4 +2975,9 @@ out_unlock:
 	rte_spinlock_unlock(&hw->state_lock);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.164316678 +0000
+++ 0099-net-virtio-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.919163676 +0000
@@ -1 +1 @@
-From 0170be6f4f90fdf3295c23520fc1547c1a2405db Mon Sep 17 00:00:00 2001
+From a508510366ea6eed6e2b74a6177ccb142b34e8ce Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0170be6f4f90fdf3295c23520fc1547c1a2405db ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 2c23f1c00e..3ab56ef769 100644
+index f4d13ec3a1..a23559850c 100644
@@ -26 +27 @@
-@@ -2418,4 +2418,9 @@ virtio_dev_start(struct rte_eth_dev *dev)
+@@ -2853,4 +2853,9 @@ virtio_dev_start(struct rte_eth_dev *dev)
@@ -36 +37 @@
-@@ -2507,4 +2512,5 @@ virtio_dev_stop(struct rte_eth_dev *dev)
+@@ -2942,4 +2947,5 @@ virtio_dev_stop(struct rte_eth_dev *dev)
@@ -42 +43 @@
-@@ -2534,4 +2540,9 @@ out_unlock:
+@@ -2969,4 +2975,9 @@ out_unlock:



More information about the stable mailing list