eal: fix C++ link of delay function pointer

[dpdk.git] / app / test-pmd / cmdline.c

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 030beec..17d238f 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -94,10 +94,6 @@ static struct cmdline *testpmd_cl;
 
 static void cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue);
 
-#ifdef RTE_NIC_BYPASS
-uint8_t bypass_is_supported(portid_t port_id);
-#endif
-
 /* *** Help command with introduction. *** */
 struct cmd_help_brief_result {
        cmdline_fixed_string_t help;
@@ -565,7 +561,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    Set crc-strip/scatter/rx-checksum/hardware-vlan/drop_en"
                        " for ports.\n\n"
 
-                       "port config all rss (all|ip|tcp|udp|sctp|ether|none)\n"
+                       "port config all rss (all|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|none)\n"
                        "    Set the RSS mode.\n\n"
 
                        "port config port-id rss reta (hash,queue)[,(hash,queue)]\n"
@@ -1371,7 +1367,7 @@ cmdline_parse_token_num_t cmd_config_mtu_value =
 cmdline_parse_inst_t cmd_config_mtu = {
        .f = cmd_config_mtu_parsed,
        .data = NULL,
-       .help_str = "port config mtu value",
+       .help_str = "port config mtu port_id value",
        .tokens = {
                (void *)&cmd_config_mtu_port,
                (void *)&cmd_config_mtu_keyword,
@@ -1535,6 +1531,7 @@ cmd_config_rss_parsed(void *parsed_result,
 {
        struct cmd_config_rss *res = parsed_result;
        struct rte_eth_rss_conf rss_conf;
+       int diag;
        uint8_t i;
 
        if (!strcmp(res->value, "all"))
@@ -1551,6 +1548,14 @@ cmd_config_rss_parsed(void *parsed_result,
                rss_conf.rss_hf = ETH_RSS_SCTP;
        else if (!strcmp(res->value, "ether"))
                rss_conf.rss_hf = ETH_RSS_L2_PAYLOAD;
+       else if (!strcmp(res->value, "port"))
+               rss_conf.rss_hf = ETH_RSS_PORT;
+       else if (!strcmp(res->value, "vxlan"))
+               rss_conf.rss_hf = ETH_RSS_VXLAN;
+       else if (!strcmp(res->value, "geneve"))
+               rss_conf.rss_hf = ETH_RSS_GENEVE;
+       else if (!strcmp(res->value, "nvgre"))
+               rss_conf.rss_hf = ETH_RSS_NVGRE;
        else if (!strcmp(res->value, "none"))
                rss_conf.rss_hf = 0;
        else {
@@ -1558,8 +1563,13 @@ cmd_config_rss_parsed(void *parsed_result,
                return;
        }
        rss_conf.rss_key = NULL;
-       for (i = 0; i < rte_eth_dev_count(); i++)
-               rte_eth_dev_rss_hash_update(i, &rss_conf);
+       for (i = 0; i < rte_eth_dev_count(); i++) {
+               diag = rte_eth_dev_rss_hash_update(i, &rss_conf);
+               if (diag < 0)
+                       printf("Configuration of RSS hash at ethernet port %d "
+                               "failed with error (%d): %s.\n",
+                               i, -diag, strerror(-diag));
+       }
 }
 
 cmdline_parse_token_string_t cmd_config_rss_port =
@@ -1572,12 +1582,12 @@ cmdline_parse_token_string_t cmd_config_rss_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss, name, "rss");
 cmdline_parse_token_string_t cmd_config_rss_value =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss, value,
-               "all#ip#tcp#udp#sctp#ether#none");
+               "all#ip#tcp#udp#sctp#ether#port#vxlan#geneve#nvgre#none");
 
 cmdline_parse_inst_t cmd_config_rss = {
        .f = cmd_config_rss_parsed,
        .data = NULL,
-       .help_str = "port config all rss all|ip|tcp|udp|sctp|ether|none",
+       .help_str = "port config all rss all|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|none",
        .tokens = {
                (void *)&cmd_config_rss_port,
                (void *)&cmd_config_rss_keyword,
@@ -3642,9 +3652,6 @@ cmd_set_bypass_mode_parsed(void *parsed_result,
        portid_t port_id = res->port_id;
        uint32_t bypass_mode = RTE_BYPASS_MODE_NORMAL;
 
-       if (!bypass_is_supported(port_id))
-               return;
-
        if (!strcmp(res->value, "bypass"))
                bypass_mode = RTE_BYPASS_MODE_BYPASS;
        else if (!strcmp(res->value, "isolate"))
@@ -3711,9 +3718,6 @@ cmd_set_bypass_event_parsed(void *parsed_result,
        uint32_t bypass_event = RTE_BYPASS_EVENT_NONE;
        uint32_t bypass_mode = RTE_BYPASS_MODE_NORMAL;
 
-       if (!bypass_is_supported(port_id))
-               return;
-
        if (!strcmp(res->event_value, "timeout"))
                bypass_event = RTE_BYPASS_EVENT_TIMEOUT;
        else if (!strcmp(res->event_value, "os_on"))
@@ -3889,9 +3893,6 @@ cmd_show_bypass_config_parsed(void *parsed_result,
                "timeout"};
        int num_events = (sizeof events) / (sizeof events[0]);
 
-       if (!bypass_is_supported(port_id))
-               return;
-
        /* Display the bypass mode.*/
        if (0 != rte_eth_dev_bypass_state_show(port_id, &bypass_mode)) {
                printf("\tFailed to get bypass mode for port = %d\n", port_id);
@@ -9493,6 +9494,10 @@ flowtype_to_str(uint16_t ftype)
                {"ipv6-sctp", RTE_ETH_FLOW_NONFRAG_IPV6_SCTP},
                {"ipv6-other", RTE_ETH_FLOW_NONFRAG_IPV6_OTHER},
                {"l2_payload", RTE_ETH_FLOW_L2_PAYLOAD},
+               {"port", RTE_ETH_FLOW_PORT},
+               {"vxlan", RTE_ETH_FLOW_VXLAN},
+               {"geneve", RTE_ETH_FLOW_GENEVE},
+               {"nvgre", RTE_ETH_FLOW_NVGRE},
        };
 
        for (i = 0; i < RTE_DIM(ftype_table); i++) {
@@ -10782,29 +10787,3 @@ cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue)
                        ports[id].need_reconfig_queues = queue;
        }
 }
-
-#ifdef RTE_NIC_BYPASS
-#include <rte_pci_dev_ids.h>
-uint8_t
-bypass_is_supported(portid_t port_id)
-{
-       struct rte_port   *port;
-       struct rte_pci_id *pci_id;
-
-       if (port_id_is_invalid(port_id, ENABLED_WARN))
-               return 0;
-
-       /* Get the device id. */
-       port    = &ports[port_id];
-       pci_id = &port->dev_info.pci_dev->id;
-
-       /* Check if NIC supports bypass. */
-       if (pci_id->device_id == IXGBE_DEV_ID_82599_BYPASS) {
-               return 1;
-       }
-       else {
-               printf("\tBypass not supported for port_id = %d.\n", port_id);
-               return 0;
-       }
-}
-#endif