From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 39A3142DAF; Mon, 3 Jul 2023 13:05:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA0E540EF0; Mon, 3 Jul 2023 13:05:26 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 5EC7A40ED5 for ; Mon, 3 Jul 2023 13:05:25 +0200 (CEST) Received: from kwepemi500020.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QvjgY0fHSztQwF; Mon, 3 Jul 2023 19:02:33 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) 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.27; Mon, 3 Jul 2023 19:05:22 +0800 From: Jie Hai To: Aman Singh , Yuying Zhang , Ferruh Yigit , Shiyang He CC: , , Subject: [PATCH] app/testpmd: fix invalid queue ID when start port Date: Mon, 3 Jul 2023 19:02:31 +0800 Message-ID: <20230703110232.28494-1-haijie1@huawei.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.69.192.56] 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 Function update_queue_state updates queue state of all queues of all ports, using the queue num nb_rxq|nb_txq stored locally by testpmd. Error on invalid queue ID occurs if we start testpmd with two ports and detach-attach one of them and start the other port first. That's because the attached port has zero queues and that differs from the nb_rxq|nb_txq. The similar error happens in multi-process senoris if secondary process attaches a port and starts it. This patch updates queue state according to the num of queues reported by driver instead of testpmd. Fixes: 141a520b35f7 ("app/testpmd: fix primary process not polling all queues") Fixes: 5028f207a4fa ("app/testpmd: fix secondary process packet forwarding") Cc: stable@dpdk.org Signed-off-by: Jie Hai --- app/test-pmd/testpmd.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 1fc70650e0a4..c8ce67d0de9f 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2479,13 +2479,22 @@ update_tx_queue_state(uint16_t port_id, uint16_t queue_id) static void update_queue_state(void) { + struct rte_port *port; + uint16_t nb_rx_queues; + uint16_t nb_tx_queues; portid_t pi; queueid_t qi; RTE_ETH_FOREACH_DEV(pi) { - for (qi = 0; qi < nb_rxq; qi++) + port = &ports[pi]; + if (eth_dev_info_get_print_err(pi, &port->dev_info) != 0) + continue; + + nb_rx_queues = RTE_MIN(nb_rxq, port->dev_info.nb_rx_queues); + nb_tx_queues = RTE_MIN(nb_txq, port->dev_info.nb_tx_queues); + for (qi = 0; qi < nb_rx_queues; qi++) update_rx_queue_state(pi, qi); - for (qi = 0; qi < nb_txq; qi++) + for (qi = 0; qi < nb_tx_queues; qi++) update_tx_queue_state(pi, qi); } } -- 2.33.0