From patchwork Fri Sep 8 11:28:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Hai X-Patchwork-Id: 131286 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0E34E42547; Fri, 8 Sep 2023 13:34:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B9D4940F35; Fri, 8 Sep 2023 13:32:40 +0200 (CEST) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id 1D71040A6D for ; Fri, 8 Sep 2023 13:32:26 +0200 (CEST) Received: from kwepemi500020.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Rhv4q2yLTzNmqx; Fri, 8 Sep 2023 19:28:43 +0800 (CST) Received: from localhost.localdomain (10.67.165.2) by kwepemi500020.china.huawei.com (7.221.188.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Fri, 8 Sep 2023 19:32:24 +0800 From: Jie Hai To: , Chaoyong He , =?utf-8?q?Niklas?= =?utf-8?q?_S=C3=B6derlund?= , Chengwen Feng , Lijun Ou , Konstantin Ananyev <"konstantin.v.ananyev@yandex.rukonstantin.ananyev"@huawei.com>, Thomas Monjalon , Ferruh Yigit CC: , Subject: [PATCH 23/36] net/nfp: fix Rx and Tx queue state Date: Fri, 8 Sep 2023 19:28:48 +0800 Message-ID: <20230908112901.1169869-24-haijie1@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230908112901.1169869-1-haijie1@huawei.com> References: <20230908112901.1169869-1-haijie1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemi500020.china.huawei.com (7.221.188.8) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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") Cc: stable@dpdk.org Signed-off-by: Jie Hai Acked-by: Chaoyong He --- 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 77dab864f319..eb7b40a6eb25 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -85,6 +85,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; @@ -137,6 +138,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; } @@ -159,11 +165,13 @@ nfp_flower_pf_stop(struct rte_eth_dev *dev) for (i = 0; i < dev->data->nb_tx_queues; i++) { this_tx_q = 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 = 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 5f94d20f1b0c..3f97bc9f8a39 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -303,6 +303,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 = dev->data->dev_private; app_fw_flower = repr->app_fw_flower; @@ -314,6 +315,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; } @@ -322,6 +328,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 = dev->data->dev_private; app_fw_flower = repr->app_fw_flower; @@ -333,6 +340,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 5092e5869de4..c0d4708f2b3e 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -1927,6 +1927,7 @@ nfp_net_stop_rx_queue(struct rte_eth_dev *dev) for (i = 0; i < dev->data->nb_rx_queues; i++) { this_rx_q = dev->data->rx_queues[i]; nfp_net_reset_rx_queue(this_rx_q); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -1952,6 +1953,7 @@ nfp_net_stop_tx_queue(struct rte_eth_dev *dev) for (i = 0; i < dev->data->nb_tx_queues; i++) { this_tx_q = 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 e3ff3d80873d..bdfd5530c55f 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -65,6 +65,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); @@ -176,6 +177,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 eaf815d06da5..3e8aeef51ab4 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -39,6 +39,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); @@ -115,6 +116,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: