RE: [PATCH v3] app/testpmd: fix incorrect queues state of secondary process
From: Zhang, Peng1X <hidden>
Date: 2022-09-10 09:22:57
-----Original Message----- From: lihuisong (C) <lihuisong@huawei.com> Sent: Wednesday, September 7, 2022 9:53 AM To: Zhang, Peng1X <redacted>; dev@dpdk.org Cc: andrew.rybchenko@oktetlabs.ru; Singh, Aman Deep [off-list ref]; Zhang, Yuying [off-list ref]; stable@dpdk.org Subject: Re: [PATCH v3] app/testpmd: fix incorrect queues state of secondary process 在 2022/9/6 22:53, Peng Zhang 写道:quoted
Primary process could set up queues state correctly when starting port, while secondary process not. Under multi-process scenario,"stream_init"quoted
function would get wrong queues state for secondary process. This commit is to get queues state from ethdev which is located in shared memory. Fixes: 3c4426db54fc ("app/testpmd: do not poll stopped queues") Cc: stable@dpdk.org Signed-off-by: Peng Zhang <redacted> --- v3: - Modify the parameter of rx or tx queue state array v2: - Change the way of getting secondary process queues states --- app/test-pmd/testpmd.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c indexaddcbcac85..977ec4fa28 100644--- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c@@ -75,6 +75,8 @@ #include "testpmd.h" +#include <ethdev_driver.h>This header file is internal, app shouldn't use it.
In this case not all PMDs implement 'rte_eth_rx/tx_queue_info_get()' and ethdev won't return 'dev->data->rx/tx_queue_state'.
quoted
+ #ifndef MAP_HUGETLB /* FreeBSD may not have MAP_HUGETLB (in fact, it probably doesn't) */ #define HUGE_FLAG (0x40000)@@ -2402,10 +2404,24 @@ start_packet_forwarding(int with_tx_first) if (!pkt_fwd_shared_rxq_check()) return; - if (stream_init != NULL) - for (i = 0; i < cur_fwd_config.nb_fwd_streams; i++) - stream_init(fwd_streams[i]); + if (stream_init != NULL) { + for (i = 0; i < cur_fwd_config.nb_fwd_streams; i++) { + if (rte_eal_process_type() != RTE_PROC_PRIMARY) { + struct fwd_stream *fs = fwd_streams[i]; + struct rte_eth_dev_data *dev_rx_data,*dev_tx_data;quoted
+ + dev_rx_data = (&rte_eth_devices[fs->rx_port])- data; + dev_tx_data = (&rte_eth_devices[fs->tx_port])- data; + + uint8_t rx_state = dev_rx_data- rx_queue_state[fs->rx_queue]; + ports[fs->rx_port].rxq[fs->rx_queue].state =rx_state;quoted
+ uint8_t tx_state = dev_tx_data- tx_queue_state[fs->tx_queue]; + ports[fs->tx_port].txq[fs->tx_queue].state =tx_state;quoted
+ } + stream_init(fwd_streams[i]); + } + }Suggest that an API in ethdev layer can be encapsulated to obtain the device Rx/Tx queue state. Both primary and secondary process get or set queue state by this API.
Suggestion sounds good, maybe better to add a new API in ethdev layer. @andrew, what's your opinion about this solution and huisong's suggestion?
quoted
port_fwd_begin = cur_fwd_config.fwd_eng->port_fwd_begin; if (port_fwd_begin != NULL) { for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) {