app/testpmd: remove duplicated offload display

"show port cap all|<port_id>" was to display offload configuration of
port(s).

But later two other commands added to show same information in more
accurate way:
 show port (port_id) rx_offload configuration
 show port (port_id) tx_offload configuration

These new commands can both show port and queue level configuration,
also with their capabilities counterparts easier to see offload
capability and configuration of the port in similar syntax.

So the functionality is duplicated and removing this version, to favor
the new commands.

Another problem with this command is it requires each new offload to be
added into the function to display them, and there were missing offloads
that are not displayed, this requirement for sure will create gaps by
time as new offloads added.

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Lance Richardson <lance.richardson@broadcom.com>
Acked-by: Xiaoyun Li <xiaoyun.li@intel.com>

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 8eb2a48ef89825a09c5985673b88dea93b8cf980..65d03b0ffb3836064411c62bef15c8dac0d613e1 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -163,7 +163,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "Display:\n"
                        "--------\n\n"
 
-                       "show port (info|stats|summary|xstats|fdir|dcb_tc|cap) (port_id|all)\n"
+                       "show port (info|stats|summary|xstats|fdir|dcb_tc) (port_id|all)\n"
                        "    Display information for port_id, or all.\n\n"
 
                        "show port port_id (module_eeprom|eeprom)\n"
@@ -7573,9 +7573,6 @@ static void cmd_showportall_parsed(void *parsed_result,
        else if (!strcmp(res->what, "dcb_tc"))
                RTE_ETH_FOREACH_DEV(i)
                        port_dcb_info_display(i);
-       else if (!strcmp(res->what, "cap"))
-               RTE_ETH_FOREACH_DEV(i)
-                       port_offload_cap_display(i);
 }
 
 cmdline_parse_token_string_t cmd_showportall_show =
@@ -7585,14 +7582,14 @@ 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#summary#stats#xstats#fdir#dcb_tc#cap");
+                                "info#summary#stats#xstats#fdir#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|summary|stats|xstats|fdir|dcb_tc|cap all",
+               "info|summary|stats|xstats|fdir|dcb_tc all",
        .tokens = {
                (void *)&cmd_showportall_show,
                (void *)&cmd_showportall_port,
@@ -7636,8 +7633,6 @@ static void cmd_showport_parsed(void *parsed_result,
 #endif
        else if (!strcmp(res->what, "dcb_tc"))
                port_dcb_info_display(res->portnum);
-       else if (!strcmp(res->what, "cap"))
-               port_offload_cap_display(res->portnum);
 }
 
 cmdline_parse_token_string_t cmd_showport_show =
@@ -7647,7 +7642,7 @@ 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#summary#stats#xstats#fdir#dcb_tc#cap");
+                                "info#summary#stats#xstats#fdir#dcb_tc");
 cmdline_parse_token_num_t cmd_showport_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, RTE_UINT16);
 
@@ -7655,7 +7650,7 @@ cmdline_parse_inst_t cmd_showport = {
        .f = cmd_showport_parsed,
        .data = NULL,
        .help_str = "show|clear port "
-               "info|summary|stats|xstats|fdir|dcb_tc|cap "
+               "info|summary|stats|xstats|fdir|dcb_tc "
                "<port_id>",
        .tokens = {
                (void *)&cmd_showport_show,

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index dab8afe5dd6f54c9464277d55373e735d81b3aa0..576d5acab54a5b24958814f70bc0a6cbeb3fb09a 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -884,295 +884,6 @@ port_module_eeprom_display(portid_t port_id)
        printf("Finish -- Port: %d MODULE EEPROM length: %d bytes\n", port_id, einfo.length);
 }
 
-void
-port_offload_cap_display(portid_t port_id)
-{
-       struct rte_eth_dev_info dev_info;
-       static const char *info_border = "************";
-       int ret;
-
-       if (port_id_is_invalid(port_id, ENABLED_WARN))
-               return;
-
-       ret = eth_dev_info_get_print_err(port_id, &dev_info);
-       if (ret != 0)
-               return;
-
-       printf("\n%s Port %d supported offload features: %s\n",
-               info_border, port_id, info_border);
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_VLAN_STRIP) {
-               printf("VLAN stripped:                 ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_VLAN_STRIP)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_QINQ_STRIP) {
-               printf("Double VLANs stripped:         ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_QINQ_STRIP)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_IPV4_CKSUM) {
-               printf("RX IPv4 checksum:              ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_IPV4_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_UDP_CKSUM) {
-               printf("RX UDP checksum:               ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_UDP_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_TCP_CKSUM) {
-               printf("RX TCP checksum:               ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_TCP_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_SCTP_CKSUM) {
-               printf("RX SCTP checksum:              ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_SCTP_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM) {
-               printf("RX Outer IPv4 checksum:        ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_OUTER_UDP_CKSUM) {
-               printf("RX Outer UDP checksum:         ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_OUTER_UDP_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_TCP_LRO) {
-               printf("Large receive offload:         ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_TCP_LRO)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_TIMESTAMP) {
-               printf("HW timestamp:                  ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_TIMESTAMP)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_KEEP_CRC) {
-               printf("Rx Keep CRC:                   ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_KEEP_CRC)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_SECURITY) {
-               printf("RX offload security:           ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_SECURITY)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT) {
-               printf("RX offload buffer split:       ");
-               if (ports[port_id].dev_conf.rxmode.offloads &
-                   RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VLAN_INSERT) {
-               printf("VLAN insert:                   ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_VLAN_INSERT)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_QINQ_INSERT) {
-               printf("Double VLANs insert:           ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_QINQ_INSERT)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPV4_CKSUM) {
-               printf("TX IPv4 checksum:              ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_IPV4_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_CKSUM) {
-               printf("TX UDP checksum:               ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_UDP_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_CKSUM) {
-               printf("TX TCP checksum:               ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_TCP_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SCTP_CKSUM) {
-               printf("TX SCTP checksum:              ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_SCTP_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) {
-               printf("TX Outer IPv4 checksum:        ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_TSO) {
-               printf("TX TCP segmentation:           ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_TCP_TSO)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_TSO) {
-               printf("TX UDP segmentation:           ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_UDP_TSO)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VXLAN_TNL_TSO) {
-               printf("TSO for VXLAN tunnel packet:   ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_VXLAN_TNL_TSO)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_GRE_TNL_TSO) {
-               printf("TSO for GRE tunnel packet:     ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_GRE_TNL_TSO)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPIP_TNL_TSO) {
-               printf("TSO for IPIP tunnel packet:    ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_IPIP_TNL_TSO)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_GENEVE_TNL_TSO) {
-               printf("TSO for GENEVE tunnel packet:  ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_GENEVE_TNL_TSO)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IP_TNL_TSO) {
-               printf("IP tunnel TSO:  ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_IP_TNL_TSO)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_TNL_TSO) {
-               printf("UDP tunnel TSO:  ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_UDP_TNL_TSO)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) {
-               printf("TX Outer UDP checksum:         ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP) {
-               printf("Tx scheduling on timestamp:    ");
-               if (ports[port_id].dev_conf.txmode.offloads &
-                   DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP)
-                       printf("on\n");
-               else
-                       printf("off\n");
-       }
-
-}
-
 int
 port_id_is_invalid(portid_t port_id, enum print_warning warning)
 {

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 911f4c758012b6bcbd8413271d621bfd13b2b2ea..ce83f31f0d04a6b05a66ac05f772a8c6f62fc36e 100644 (file)
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -777,7 +777,6 @@ void port_summary_display(portid_t port_id);
 void port_eeprom_display(portid_t port_id);
 void port_module_eeprom_display(portid_t port_id);
 void port_summary_header_display(void);
-void port_offload_cap_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);

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 703dead0c1b04e4433e0f5cb19cb7222a4e82261..f59eb8a27d2cf61f8828188e82cce20447cc1975 100644 (file)
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -24,10 +24,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|xstats|fdir|stat_qmap|dcb_tc|cap X
-       info [Mul-choice STRING]: show|clear port info|stats|xstats|fdir|stat_qmap|dcb_tc|cap all
-       stats [Mul-choice STRING]: show|clear port info|stats|xstats|fdir|stat_qmap|dcb_tc|cap X
-       stats [Mul-choice STRING]: show|clear port info|stats|xstats|fdir|stat_qmap|dcb_tc|cap all
+       info [Mul-choice STRING]: show|clear port info|stats|xstats|fdir|stat_qmap|dcb_tc X
+       info [Mul-choice STRING]: show|clear port info|stats|xstats|fdir|stat_qmap|dcb_tc all
+       stats [Mul-choice STRING]: show|clear port info|stats|xstats|fdir|stat_qmap|dcb_tc X
+       stats [Mul-choice STRING]: show|clear port info|stats|xstats|fdir|stat_qmap|dcb_tc all
        ...
 
 
@@ -159,7 +159,7 @@ show port
 
 Display information for a given port or all ports::
 
-   testpmd> show port (info|summary|stats|xstats|fdir|stat_qmap|dcb_tc|cap) (port_id|all)
+   testpmd> show port (info|summary|stats|xstats|fdir|stat_qmap|dcb_tc) (port_id|all)
 
 The available information categories are:
 
@@ -177,8 +177,6 @@ The available information categories are:
 
 * ``dcb_tc``: DCB information such as TC mapping.
 
-* ``cap``: Supported offload capabilities.
-
 For example:
 
 .. code-block:: console