[PATCH v2 2/2] app/testpmd: fix segment fault with invalid queue id

[Dengdui Huang]

When input queue id is invalid, it will lead to
Segmentation fault, like:

dpdk-testpmd -a 0000:01:00.0 -- -i
testpmd> show port 0 txq/rxq 99 desc 0 status
Segmentation fault

dpdk-testpmd -a 0000:01:00.0 -- -i
testpmd> show port 0 rxq 99 desc used count
Segmentation fault

This patch fixes it.

Fixes: fae9aa717d6c ("app/testpmd: support checking descriptor status")
Fixes: 3f9acb5c83bb ("ethdev: avoid non-dataplane checks in Rx queue count")
Cc: sta...@dpdk.org

Signed-off-by: Dengdui Huang <huangdeng...@huawei.com>
---
 app/test-pmd/cmdline.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 7b20bef4e9..334434497c 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -12275,12 +12275,13 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result,
        struct cmd_show_rx_tx_desc_status_result *res = parsed_result;
        int rc;
 
-       if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
-               fprintf(stderr, "invalid port id %u\n", res->cmd_pid);
-               return;
-       }
-
        if (!strcmp(res->cmd_keyword, "rxq")) {
+               if (rte_eth_dev_is_valid_rxq(res->cmd_pid, res->cmd_qid) != 0) {
+                       fprintf(stderr,
+                               "Invalid input: port id = %d, queue id = %d\n",
+                               res->cmd_pid, res->cmd_qid);
+                       return;
+               }
                rc = rte_eth_rx_descriptor_status(res->cmd_pid, res->cmd_qid,
                                             res->cmd_did);
                if (rc < 0) {
@@ -12296,6 +12297,12 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result,
                else
                        printf("Desc status = UNAVAILABLE\n");
        } else if (!strcmp(res->cmd_keyword, "txq")) {
+               if (rte_eth_dev_is_valid_txq(res->cmd_pid, res->cmd_qid) != 0) {
+                       fprintf(stderr,
+                               "Invalid input: port id = %d, queue id = %d\n",
+                               res->cmd_pid, res->cmd_qid);
+                       return;
+               }
                rc = rte_eth_tx_descriptor_status(res->cmd_pid, res->cmd_qid,
                                             res->cmd_did);
                if (rc < 0) {
@@ -12375,8 +12382,10 @@ cmd_show_rx_queue_desc_used_count_parsed(void 
*parsed_result,
        struct cmd_show_rx_queue_desc_used_count_result *res = parsed_result;
        int rc;
 
-       if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
-               fprintf(stderr, "invalid port id %u\n", res->cmd_pid);
+       if (rte_eth_dev_is_valid_rxq(res->cmd_pid, res->cmd_qid) != 0) {
+               fprintf(stderr,
+                       "Invalid input: port id = %d, queue id = %d\n",
+                       res->cmd_pid, res->cmd_qid);
                return;
        }
 
-- 
2.33.0