patch 'net/nfp: fix Rx and Tx queue state' has been queued to stable release 22.11.4
Xueming Li
xuemingl at nvidia.com
Sun Oct 22 16:22:34 CEST 2023
Hi,
FYI, your patch has been queued to stable release 22.11.4
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/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=4e28c37ff58288ae06c051978f6f0b5f7316831a
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 4e28c37ff58288ae06c051978f6f0b5f7316831a Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1 at huawei.com>
Date: Fri, 8 Sep 2023 19:28:48 +0800
Subject: [PATCH] net/nfp: fix Rx and Tx queue state
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit c46216e77ac3b1890eb622bea4bcc8c54f9da820 ]
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: Chaoyong He <chaoyong.he at corigine.com>
---
drivers/net/nfp/flower/nfp_flower.c | 8 ++++++++
drivers/net/nfp/flower/nfp_flower_representor.c | 12 ++++++++++++
drivers/net/nfp/nfp_common.c | 2 ++
drivers/net/nfp/nfp_ethdev.c | 6 ++++++
drivers/net/nfp/nfp_ethdev_vf.c | 6 ++++++
5 files changed, 34 insertions(+)
diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c
index c14a481a81..9872e010d2 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -84,6 +84,7 @@ int
nfp_flower_pf_start(struct rte_eth_dev *dev)
{
int ret;
+ uint16_t i;
uint32_t new_ctrl;
uint32_t update = 0;
struct nfp_net_hw *hw;
@@ -136,6 +137,11 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
return -EIO;
}
+ 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;
+
return 0;
}
@@ -158,11 +164,13 @@ nfp_flower_pf_stop(struct rte_eth_dev *dev)
for (i = 0; i < dev->data->nb_tx_queues; i++) {
this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i];
nfp_net_reset_tx_queue(this_tx_q);
+ dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
}
for (i = 0; i < dev->data->nb_rx_queues; i++) {
this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i];
nfp_net_reset_rx_queue(this_rx_q);
+ dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
}
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index b9f2f631ff..32c4574bdc 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -300,6 +300,7 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev)
{
struct nfp_flower_representor *repr;
struct nfp_app_fw_flower *app_fw_flower;
+ uint16_t i;
repr = (struct nfp_flower_representor *)dev->data->dev_private;
app_fw_flower = repr->app_fw_flower;
@@ -311,6 +312,11 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev)
nfp_flower_cmsg_port_mod(app_fw_flower, repr->port_id, true);
+ 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;
+
return 0;
}
@@ -319,6 +325,7 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev)
{
struct nfp_flower_representor *repr;
struct nfp_app_fw_flower *app_fw_flower;
+ uint16_t i;
repr = (struct nfp_flower_representor *)dev->data->dev_private;
app_fw_flower = repr->app_fw_flower;
@@ -330,6 +337,11 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev)
repr->nfp_idx, 0);
}
+ 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;
}
diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index b673370f20..b75fd22e03 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -1337,6 +1337,7 @@ nfp_net_stop_rx_queue(struct rte_eth_dev *dev)
for (i = 0; i < dev->data->nb_rx_queues; i++) {
this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i];
nfp_net_reset_rx_queue(this_rx_q);
+ dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
}
}
@@ -1362,6 +1363,7 @@ nfp_net_stop_tx_queue(struct rte_eth_dev *dev)
for (i = 0; i < dev->data->nb_tx_queues; i++) {
this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i];
nfp_net_reset_tx_queue(this_tx_q);
+ dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
}
}
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 29491f6e6d..689e26f1e1 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -70,6 +70,7 @@ nfp_net_start(struct rte_eth_dev *dev)
struct rte_eth_conf *dev_conf;
struct rte_eth_rxmode *rxmode;
uint32_t intr_vector;
+ uint16_t i;
int ret;
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -174,6 +175,11 @@ nfp_net_start(struct rte_eth_dev *dev)
hw->ctrl = new_ctrl;
+ 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;
+
return 0;
error:
diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c
index 1877d6b76b..268820cbea 100644
--- a/drivers/net/nfp/nfp_ethdev_vf.c
+++ b/drivers/net/nfp/nfp_ethdev_vf.c
@@ -45,6 +45,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)
struct rte_eth_conf *dev_conf;
struct rte_eth_rxmode *rxmode;
uint32_t intr_vector;
+ uint16_t i;
int ret;
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -124,6 +125,11 @@ nfp_netvf_start(struct rte_eth_dev *dev)
hw->ctrl = new_ctrl;
+ 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;
+
return 0;
error:
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-10-22 22:17:38.856959200 +0800
+++ 0125-net-nfp-fix-Rx-and-Tx-queue-state.patch 2023-10-22 22:17:34.406723700 +0800
@@ -1 +1 @@
-From c46216e77ac3b1890eb622bea4bcc8c54f9da820 Mon Sep 17 00:00:00 2001
+From 4e28c37ff58288ae06c051978f6f0b5f7316831a Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit c46216e77ac3b1890eb622bea4bcc8c54f9da820 ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -27 +29 @@
-index 98e6f7f927..2c64ff5fc0 100644
+index c14a481a81..9872e010d2 100644
@@ -30 +32 @@
-@@ -79,6 +79,7 @@ int
+@@ -84,6 +84,7 @@ int
@@ -38 +40 @@
-@@ -131,6 +132,11 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
+@@ -136,6 +137,11 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
@@ -50 +52 @@
-@@ -153,11 +159,13 @@ nfp_flower_pf_stop(struct rte_eth_dev *dev)
+@@ -158,11 +164,13 @@ nfp_flower_pf_stop(struct rte_eth_dev *dev)
@@ -52 +54 @@
- this_tx_q = dev->data->tx_queues[i];
+ this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i];
@@ -58 +60 @@
- this_rx_q = dev->data->rx_queues[i];
+ this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i];
@@ -65 +67 @@
-index e4c5d765e7..16381d8f05 100644
+index b9f2f631ff..32c4574bdc 100644
@@ -68 +70 @@
-@@ -310,6 +310,7 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev)
+@@ -300,6 +300,7 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev)
@@ -74 +76 @@
- repr = dev->data->dev_private;
+ repr = (struct nfp_flower_representor *)dev->data->dev_private;
@@ -76 +78 @@
-@@ -321,6 +322,11 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev)
+@@ -311,6 +312,11 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev)
@@ -88 +90 @@
-@@ -329,6 +335,7 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev)
+@@ -319,6 +325,7 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev)
@@ -94 +96 @@
- repr = dev->data->dev_private;
+ repr = (struct nfp_flower_representor *)dev->data->dev_private;
@@ -96 +98 @@
-@@ -340,6 +347,11 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev)
+@@ -330,6 +337,11 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev)
@@ -109 +111 @@
-index 5683afc40a..7e93221532 100644
+index b673370f20..b75fd22e03 100644
@@ -112 +114 @@
-@@ -1926,6 +1926,7 @@ nfp_net_stop_rx_queue(struct rte_eth_dev *dev)
+@@ -1337,6 +1337,7 @@ nfp_net_stop_rx_queue(struct rte_eth_dev *dev)
@@ -114 +116 @@
- this_rx_q = dev->data->rx_queues[i];
+ this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i];
@@ -120 +122 @@
-@@ -1951,6 +1952,7 @@ nfp_net_stop_tx_queue(struct rte_eth_dev *dev)
+@@ -1362,6 +1363,7 @@ nfp_net_stop_tx_queue(struct rte_eth_dev *dev)
@@ -122 +124 @@
- this_tx_q = dev->data->tx_queues[i];
+ this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i];
@@ -129 +131 @@
-index ebc5538291..a2fa67bc50 100644
+index 29491f6e6d..689e26f1e1 100644
@@ -132 +134 @@
-@@ -52,6 +52,7 @@ nfp_net_start(struct rte_eth_dev *dev)
+@@ -70,6 +70,7 @@ nfp_net_start(struct rte_eth_dev *dev)
@@ -140 +142 @@
-@@ -167,6 +168,11 @@ nfp_net_start(struct rte_eth_dev *dev)
+@@ -174,6 +175,11 @@ nfp_net_start(struct rte_eth_dev *dev)
@@ -153 +155 @@
-index 0c94fc51ad..5363799115 100644
+index 1877d6b76b..268820cbea 100644
@@ -156 +158 @@
-@@ -36,6 +36,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)
+@@ -45,6 +45,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)
@@ -164 +166 @@
-@@ -112,6 +113,11 @@ nfp_netvf_start(struct rte_eth_dev *dev)
+@@ -124,6 +125,11 @@ nfp_netvf_start(struct rte_eth_dev *dev)
More information about the stable
mailing list