patch 'net/octeon_ep: 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:38 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/2e34b54c6e61d82b9c92a21aa43070b5dd129804
Thanks.
Kevin
---
>From 2e34b54c6e61d82b9c92a21aa43070b5dd129804 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1 at huawei.com>
Date: Fri, 8 Sep 2023 19:28:51 +0800
Subject: [PATCH] net/octeon_ep: fix Rx and Tx queue state
[ upstream commit af2c10811034e1b1c0b4b4588a04b909cf69dcd1 ]
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/octeontx_ep/otx_ep_ethdev.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c b/drivers/net/octeontx_ep/otx_ep_ethdev.c
index c3cec6d833..132429998b 100644
--- a/drivers/net/octeontx_ep/otx_ep_ethdev.c
+++ b/drivers/net/octeontx_ep/otx_ep_ethdev.c
@@ -76,4 +76,9 @@ otx_ep_dev_start(struct rte_eth_dev *eth_dev)
otx_ep_info("dev started\n");
+ for (q = 0; q < eth_dev->data->nb_rx_queues; q++)
+ eth_dev->data->rx_queue_state[q] = RTE_ETH_QUEUE_STATE_STARTED;
+ for (q = 0; q < eth_dev->data->nb_tx_queues; q++)
+ eth_dev->data->tx_queue_state[q] = RTE_ETH_QUEUE_STATE_STARTED;
+
return 0;
}
@@ -84,7 +89,13 @@ otx_ep_dev_stop(struct rte_eth_dev *eth_dev)
{
struct otx_ep_device *otx_epvf = OTX_EP_DEV(eth_dev);
+ uint16_t i;
otx_epvf->fn_list.disable_io_queues(otx_epvf);
+ for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
+ eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+ for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
+ eth_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.010726665 +0000
+++ 0092-net-octeon_ep-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.912163653 +0000
@@ -1 +1 @@
-From af2c10811034e1b1c0b4b4588a04b909cf69dcd1 Mon Sep 17 00:00:00 2001
+From 2e34b54c6e61d82b9c92a21aa43070b5dd129804 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit af2c10811034e1b1c0b4b4588a04b909cf69dcd1 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
- drivers/net/octeon_ep/otx_ep_ethdev.c | 11 +++++++++++
+ drivers/net/octeontx_ep/otx_ep_ethdev.c | 11 +++++++++++
@@ -22,5 +23,5 @@
-diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c
-index 57b965ad06..970372bbd7 100644
---- a/drivers/net/octeon_ep/otx_ep_ethdev.c
-+++ b/drivers/net/octeon_ep/otx_ep_ethdev.c
-@@ -157,4 +157,9 @@ otx_ep_dev_start(struct rte_eth_dev *eth_dev)
+diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c b/drivers/net/octeontx_ep/otx_ep_ethdev.c
+index c3cec6d833..132429998b 100644
+--- a/drivers/net/octeontx_ep/otx_ep_ethdev.c
++++ b/drivers/net/octeontx_ep/otx_ep_ethdev.c
+@@ -76,4 +76,9 @@ otx_ep_dev_start(struct rte_eth_dev *eth_dev)
@@ -36 +37 @@
-@@ -165,7 +170,13 @@ otx_ep_dev_stop(struct rte_eth_dev *eth_dev)
+@@ -84,7 +89,13 @@ otx_ep_dev_stop(struct rte_eth_dev *eth_dev)
More information about the stable
mailing list