app/testpmd: add command to display queue info

Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Acked-by: Remy Horton <remy.horton@intel.com>

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index d5a625b..0afdc96 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -5352,6 +5352,53 @@ cmdline_parse_inst_t cmd_showport = {
        },
 };
 
+/* *** SHOW QUEUE INFO *** */
+struct cmd_showqueue_result {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t type;
+       cmdline_fixed_string_t what;
+       uint8_t portnum;
+       uint16_t queuenum;
+};
+
+static void
+cmd_showqueue_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_showqueue_result *res = parsed_result;
+
+       if (!strcmp(res->type, "rxq"))
+               rx_queue_infos_display(res->portnum, res->queuenum);
+       else if (!strcmp(res->type, "txq"))
+               tx_queue_infos_display(res->portnum, res->queuenum);
+}
+
+cmdline_parse_token_string_t cmd_showqueue_show =
+       TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, show, "show");
+cmdline_parse_token_string_t cmd_showqueue_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, type, "rxq#txq");
+cmdline_parse_token_string_t cmd_showqueue_what =
+       TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, what, "info");
+cmdline_parse_token_num_t cmd_showqueue_portnum =
+       TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT8);
+cmdline_parse_token_num_t cmd_showqueue_queuenum =
+       TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum, UINT16);
+
+cmdline_parse_inst_t cmd_showqueue = {
+       .f = cmd_showqueue_parsed,
+       .data = NULL,
+       .help_str = "show rxq|txq info <port number> <queue_number>",
+       .tokens = {
+               (void *)&cmd_showqueue_show,
+               (void *)&cmd_showqueue_type,
+               (void *)&cmd_showqueue_what,
+               (void *)&cmd_showqueue_portnum,
+               (void *)&cmd_showqueue_queuenum,
+               NULL,
+       },
+};
+
 /* *** READ PORT REGISTER *** */
 struct cmd_read_reg_result {
        cmdline_fixed_string_t read;
@@ -9217,6 +9264,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_help_long,
        (cmdline_parse_inst_t *)&cmd_quit,
        (cmdline_parse_inst_t *)&cmd_showport,
+       (cmdline_parse_inst_t *)&cmd_showqueue,
        (cmdline_parse_inst_t *)&cmd_showportall,
        (cmdline_parse_inst_t *)&cmd_showcfg,
        (cmdline_parse_inst_t *)&cmd_start,

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 695162e..938b456 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -316,6 +316,69 @@ nic_stats_mapping_display(portid_t port_id)
               nic_stats_mapping_border, nic_stats_mapping_border);
 }
 
+void
+rx_queue_infos_display(portid_t port_id, uint16_t queue_id)
+{
+       struct rte_eth_rxq_info qinfo;
+       int32_t rc;
+       static const char *info_border = "*********************";
+
+       rc = rte_eth_rx_queue_info_get(port_id, queue_id, &qinfo);
+       if (rc != 0) {
+               printf("Failed to retrieve information for port: %hhu, "
+                       "RX queue: %hu\nerror desc: %s(%d)\n",
+                       port_id, queue_id, strerror(-rc), rc);
+               return;
+       }
+
+       printf("\n%s Infos for port %-2u, RX queue %-2u %s",
+              info_border, port_id, queue_id, info_border);
+
+       printf("\nMempool: %s", (qinfo.mp == NULL) ? "NULL" : qinfo.mp->name);
+       printf("\nRX prefetch threshold: %hhu", qinfo.conf.rx_thresh.pthresh);
+       printf("\nRX host threshold: %hhu", qinfo.conf.rx_thresh.hthresh);
+       printf("\nRX writeback threshold: %hhu", qinfo.conf.rx_thresh.wthresh);
+       printf("\nRX free threshold: %hu", qinfo.conf.rx_free_thresh);
+       printf("\nRX drop packets: %s",
+               (qinfo.conf.rx_drop_en != 0) ? "on" : "off");
+       printf("\nRX deferred start: %s",
+               (qinfo.conf.rx_deferred_start != 0) ? "on" : "off");
+       printf("\nRX scattered packets: %s",
+               (qinfo.scattered_rx != 0) ? "on" : "off");
+       printf("\nNumber of RXDs: %hu", qinfo.nb_desc);
+       printf("\n");
+}
+
+void
+tx_queue_infos_display(portid_t port_id, uint16_t queue_id)
+{
+       struct rte_eth_txq_info qinfo;
+       int32_t rc;
+       static const char *info_border = "*********************";
+
+       rc = rte_eth_tx_queue_info_get(port_id, queue_id, &qinfo);
+       if (rc != 0) {
+               printf("Failed to retrieve information for port: %hhu, "
+                       "TX queue: %hu\nerror desc: %s(%d)\n",
+                       port_id, queue_id, strerror(-rc), rc);
+               return;
+       }
+
+       printf("\n%s Infos for port %-2u, TX queue %-2u %s",
+              info_border, port_id, queue_id, info_border);
+
+       printf("\nTX prefetch threshold: %hhu", qinfo.conf.tx_thresh.pthresh);
+       printf("\nTX host threshold: %hhu", qinfo.conf.tx_thresh.hthresh);
+       printf("\nTX writeback threshold: %hhu", qinfo.conf.tx_thresh.wthresh);
+       printf("\nTX RS threshold: %hu", qinfo.conf.tx_rs_thresh);
+       printf("\nTX free threshold: %hu", qinfo.conf.tx_free_thresh);
+       printf("\nTX flags: %#x", qinfo.conf.txq_flags);
+       printf("\nTX deferred start: %s",
+               (qinfo.conf.tx_deferred_start != 0) ? "on" : "off");
+       printf("\nNumber of TXDs: %hu", qinfo.nb_desc);
+       printf("\n");
+}
+
 void
 port_infos_display(portid_t port_id)
 {
@@ -404,6 +467,20 @@ port_infos_display(portid_t port_id)
                        printf("  %s\n", (p ? p : "unknown"));
                }
        }
+
+       printf("Max possible RX queues: %u\n", dev_info.max_rx_queues);
+       printf("Max possible number of RXDs per queue: %hu\n",
+               dev_info.rx_desc_lim.nb_max);
+       printf("Min possible number of RXDs per queue: %hu\n",
+               dev_info.rx_desc_lim.nb_min);
+       printf("RXDs number alignment: %hu\n", dev_info.rx_desc_lim.nb_align);
+
+       printf("Max possible TX queues: %u\n", dev_info.max_tx_queues);
+       printf("Max possible number of TXDs per queue: %hu\n",
+               dev_info.tx_desc_lim.nb_max);
+       printf("Min possible number of TXDs per queue: %hu\n",
+               dev_info.tx_desc_lim.nb_min);
+       printf("TXDs number alignment: %hu\n", dev_info.tx_desc_lim.nb_align);
 }
 
 int

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index ef1a029..d6742d6 100644 (file)
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -460,6 +460,8 @@ void nic_xstats_display(portid_t port_id);
 void nic_xstats_clear(portid_t port_id);
 void nic_stats_mapping_display(portid_t port_id);
 void port_infos_display(portid_t port_id);
+void rx_queue_infos_display(portid_t port_idi, uint16_t queue_id);
+void tx_queue_infos_display(portid_t port_idi, uint16_t queue_id);
 void fwd_lcores_config_display(void);
 void fwd_config_display(void);
 void rxtx_config_display(void);