app/testpmd: add command to display DCB info

This patch adds a command to display DCB info in ports.

Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
Acked-by: Jijiang Liu <jijiang.liu@intel.com>
Acked-by: Helin Zhang <helin.zhang@intel.com>

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0f81462..d5a625b 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -182,7 +182,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "Display:\n"
                        "--------\n\n"
 
-                       "show port (info|stats|xstats|fdir|stat_qmap) (port_id|all)\n"
+                       "show port (info|stats|xstats|fdir|stat_qmap|dcb_tc) (port_id|all)\n"
                        "    Display information for port_id, or all.\n\n"
 
                        "show port X rss reta (size) (mask0,mask1,...)\n"
@@ -5268,6 +5268,9 @@ static void cmd_showportall_parsed(void *parsed_result,
        else if (!strcmp(res->what, "stat_qmap"))
                FOREACH_PORT(i, ports)
                        nic_stats_mapping_display(i);
+       else if (!strcmp(res->what, "dcb_tc"))
+               FOREACH_PORT(i, ports)
+                       port_dcb_info_display(i);
 }
 
 cmdline_parse_token_string_t cmd_showportall_show =
@@ -5277,13 +5280,13 @@ cmdline_parse_token_string_t cmd_showportall_port =
        TOKEN_STRING_INITIALIZER(struct cmd_showportall_result, port, "port");
 cmdline_parse_token_string_t cmd_showportall_what =
        TOKEN_STRING_INITIALIZER(struct cmd_showportall_result, what,
-                                "info#stats#xstats#fdir#stat_qmap");
+                                "info#stats#xstats#fdir#stat_qmap#dcb_tc");
 cmdline_parse_token_string_t cmd_showportall_all =
        TOKEN_STRING_INITIALIZER(struct cmd_showportall_result, all, "all");
 cmdline_parse_inst_t cmd_showportall = {
        .f = cmd_showportall_parsed,
        .data = NULL,
-       .help_str = "show|clear port info|stats|xstats|fdir|stat_qmap all",
+       .help_str = "show|clear port info|stats|xstats|fdir|stat_qmap|dcb_tc all",
        .tokens = {
                (void *)&cmd_showportall_show,
                (void *)&cmd_showportall_port,
@@ -5321,6 +5324,8 @@ static void cmd_showport_parsed(void *parsed_result,
                 fdir_get_infos(res->portnum);
        else if (!strcmp(res->what, "stat_qmap"))
                nic_stats_mapping_display(res->portnum);
+       else if (!strcmp(res->what, "dcb_tc"))
+               port_dcb_info_display(res->portnum);
 }
 
 cmdline_parse_token_string_t cmd_showport_show =
@@ -5330,14 +5335,14 @@ cmdline_parse_token_string_t cmd_showport_port =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_result, port, "port");
 cmdline_parse_token_string_t cmd_showport_what =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_result, what,
-                                "info#stats#xstats#fdir#stat_qmap");
+                                "info#stats#xstats#fdir#stat_qmap#dcb_tc");
 cmdline_parse_token_num_t cmd_showport_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT8);
 
 cmdline_parse_inst_t cmd_showport = {
        .f = cmd_showport_parsed,
        .data = NULL,
-       .help_str = "show|clear port info|stats|xstats|fdir|stat_qmap X (X = port number)",
+       .help_str = "show|clear port info|stats|xstats|fdir|stat_qmap|dcb_tc X (X = port number)",
        .tokens = {
                (void *)&cmd_showport_show,
                (void *)&cmd_showport_port,

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index a71257f..695162e 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2302,3 +2302,46 @@ mcast_addr_remove(uint8_t port_id, struct ether_addr *mc_addr)
        mcast_addr_pool_remove(port, i);
        eth_port_multicast_addr_list_set(port_id);
 }
+
+void
+port_dcb_info_display(uint8_t port_id)
+{
+       struct rte_eth_dcb_info dcb_info;
+       uint16_t i;
+       int ret;
+       static const char *border = "================";
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       ret = rte_eth_dev_get_dcb_info(port_id, &dcb_info);
+       if (ret) {
+               printf("\n Failed to get dcb infos on port %-2d\n",
+                       port_id);
+               return;
+       }
+       printf("\n  %s DCB infos for port %-2d  %s\n", border, port_id, border);
+       printf("  TC NUMBER: %d\n", dcb_info.nb_tcs);
+       printf("\n  TC :        ");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", i);
+       printf("\n  Priority :  ");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", dcb_info.prio_tc[i]);
+       printf("\n  BW percent :");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d%%", dcb_info.tc_bws[i]);
+       printf("\n  RXQ base :  ");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", dcb_info.tc_queue.tc_rxq[0][i].base);
+       printf("\n  RXQ number :");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", dcb_info.tc_queue.tc_rxq[0][i].nb_queue);
+       printf("\n  TXQ base :  ");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", dcb_info.tc_queue.tc_txq[0][i].base);
+       printf("\n  TXQ number :");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", dcb_info.tc_queue.tc_txq[0][i].nb_queue);
+       printf("\n");
+}

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 72a7686..ef1a029 100644 (file)
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -559,6 +559,7 @@ int tx_queue_id_is_invalid(queueid_t txq_id);
 /* Functions to manage the set of filtered Multicast MAC addresses */
 void mcast_addr_add(uint8_t port_id, struct ether_addr *mc_addr);
 void mcast_addr_remove(uint8_t port_id, struct ether_addr *mc_addr);
+void port_dcb_info_display(uint8_t port_id);
 
 enum print_warning {
        ENABLED_WARN = 0,

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index b74819b..2d0599d 100644 (file)
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -50,10 +50,10 @@ If you type a partial command and hit ``<TAB>`` you get a list of the available
 
    testpmd> show port <TAB>
 
-       info [Mul-choice STRING]: show|clear port info|stats|fdir|stat_qmap X
-       info [Mul-choice STRING]: show|clear port info|stats|fdir|stat_qmap all
-       stats [Mul-choice STRING]: show|clear port info|stats|fdir|stat_qmap X
-       stats [Mul-choice STRING]: show|clear port info|stats|fdir|stat_qmap all
+       info [Mul-choice STRING]: show|clear port info|stats|fdir|stat_qmap|dcb_tc X
+       info [Mul-choice STRING]: show|clear port info|stats|fdir|stat_qmap|dcb_tc all
+       stats [Mul-choice STRING]: show|clear port info|stats|fdir|stat_qmap|dcb_tc X
+       stats [Mul-choice STRING]: show|clear port info|stats|fdir|stat_qmap|dcb_tc all
        ...
 
 
@@ -128,7 +128,7 @@ show port
 
 Display information for a given port or all ports::
 
-   testpmd> show port (info|stats|fdir|stat_qmap) (port_id|all)
+   testpmd> show port (info|stats|fdir|stat_qmap|dcb_tc) (port_id|all)
 
 The available information categories are:
 
@@ -140,6 +140,8 @@ The available information categories are:
 
 * ``stat_qmap``: Queue statistics mapping.
 
+* ``dcb_tc``: DCB information such as TC mapping.
+
 For example:
 
 .. code-block:: console