From: Peng Zhang <peng1x.zh...@intel.com> Primary process could set up queues state correctly when starting port, but under multi-process scenario, "stream_init" 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: sta...@dpdk.org Signed-off-by: Peng Zhang <peng1x.zh...@intel.com> --- app/test-pmd/testpmd.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index addcbcac85..70f907d96b 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -75,6 +75,8 @@ #include "testpmd.h" +#include <ethdev_driver.h> + #ifndef MAP_HUGETLB /* FreeBSD may not have MAP_HUGETLB (in fact, it probably doesn't) */ #define HUGE_FLAG (0x40000) @@ -2402,9 +2404,23 @@ 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++) + 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; + + 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_port]; + ports[fs->rx_port].rxq[fs->rx_queue].state = rx_state; + uint8_t tx_state = dev_tx_data->tx_queue_state[fs->tx_port]; + ports[fs->tx_port].txq[fs->tx_queue].state = tx_state; + } stream_init(fwd_streams[i]); + } + } port_fwd_begin = cur_fwd_config.fwd_eng->port_fwd_begin; if (port_fwd_begin != NULL) { -- 2.25.1