ethdev: add L2TPv3 over IP header to flow API

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

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 7d48fed..2d74df8 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -11,9 +11,7 @@
 #include <termios.h>
 #include <unistd.h>
 #include <inttypes.h>
-#ifdef RTE_EXEC_ENV_FREEBSD
 #include <sys/socket.h>
-#endif
 #include <netinet/in.h>
 
 #include <sys/queue.h>
@@ -243,6 +241,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 
                        "show port (port_id) rxq|txq (queue_id) desc (desc_id) status"
                        "       Show status of rx|tx descriptor.\n\n"
+
+                       "show port (port_id) macs|mcast_macs"
+                       "       Display list of mac addresses added to port.\n\n"
                );
        }
 
@@ -876,7 +877,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "udp_tso|outer_ipv4_cksum|qinq_insert|vxlan_tnl_tso|"
                        "gre_tnl_tso|ipip_tnl_tso|geneve_tnl_tso|"
                        "macsec_insert|mt_lockfree|multi_segs|mbuf_fast_free|"
-                       "security|match_metadata on|off\n"
+                       "security on|off\n"
                        "    Enable or disable a per port Tx offloading"
                        " on all Tx queues of a port\n\n"
 
@@ -18573,8 +18574,7 @@ cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_offload =
                          "sctp_cksum#tcp_tso#udp_tso#outer_ipv4_cksum#"
                          "qinq_insert#vxlan_tnl_tso#gre_tnl_tso#"
                          "ipip_tnl_tso#geneve_tnl_tso#macsec_insert#"
-                         "mt_lockfree#multi_segs#mbuf_fast_free#security#"
-                         "match_metadata");
+                         "mt_lockfree#multi_segs#mbuf_fast_free#security");
 cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_per_port_tx_offload_result,
@@ -18659,8 +18659,7 @@ cmdline_parse_inst_t cmd_config_per_port_tx_offload = {
                    "sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
                    "qinq_insert|vxlan_tnl_tso|gre_tnl_tso|"
                    "ipip_tnl_tso|geneve_tnl_tso|macsec_insert|"
-                   "mt_lockfree|multi_segs|mbuf_fast_free|security|"
-                   "match_metadata on|off",
+                   "mt_lockfree|multi_segs|mbuf_fast_free|security on|off",
        .tokens = {
                (void *)&cmd_config_per_port_tx_offload_result_port,
                (void *)&cmd_config_per_port_tx_offload_result_config,
@@ -18859,7 +18858,7 @@ cmd_show_tx_metadata_parsed(void *parsed_result,
        }
        if (!strcmp(res->cmd_keyword, "tx_metadata")) {
                printf("Port %u tx_metadata: %u\n", res->cmd_pid,
-                       rte_be_to_cpu_32(ports[res->cmd_pid].tx_metadata));
+                      ports[res->cmd_pid].tx_metadata);
        }
 }
 
@@ -19175,6 +19174,56 @@ cmdline_parse_inst_t cmd_set_port_ptypes = {
        },
 };
 
+/* *** display mac addresses added to a port *** */
+struct cmd_showport_macs_result {
+       cmdline_fixed_string_t cmd_show;
+       cmdline_fixed_string_t cmd_port;
+       cmdline_fixed_string_t cmd_keyword;
+       portid_t cmd_pid;
+};
+
+static void
+cmd_showport_macs_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_showport_macs_result *res = parsed_result;
+
+       if (port_id_is_invalid(res->cmd_pid, ENABLED_WARN))
+               return;
+
+       if (!strcmp(res->cmd_keyword, "macs"))
+               show_macs(res->cmd_pid);
+       else if (!strcmp(res->cmd_keyword, "mcast_macs"))
+               show_mcast_macs(res->cmd_pid);
+}
+
+cmdline_parse_token_string_t cmd_showport_macs_show =
+       TOKEN_STRING_INITIALIZER(struct cmd_showport_macs_result,
+                       cmd_show, "show");
+cmdline_parse_token_string_t cmd_showport_macs_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_showport_macs_result,
+                       cmd_port, "port");
+cmdline_parse_token_num_t cmd_showport_macs_pid =
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_macs_result,
+                       cmd_pid, UINT16);
+cmdline_parse_token_string_t cmd_showport_macs_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_showport_macs_result,
+                       cmd_keyword, "macs#mcast_macs");
+
+cmdline_parse_inst_t cmd_showport_macs = {
+       .f = cmd_showport_macs_parsed,
+       .data = NULL,
+       .help_str = "show port <port_id> macs|mcast_macs",
+       .tokens = {
+               (void *)&cmd_showport_macs_show,
+               (void *)&cmd_showport_macs_port,
+               (void *)&cmd_showport_macs_pid,
+               (void *)&cmd_showport_macs_keyword,
+               NULL,
+       },
+};
+
 /* ******************************************************************************** */
 
 /* list of instructions */
@@ -19293,6 +19342,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_setup_rxtx_queue,
        (cmdline_parse_inst_t *)&cmd_config_rss_reta,
        (cmdline_parse_inst_t *)&cmd_showport_reta,
+       (cmdline_parse_inst_t *)&cmd_showport_macs,
        (cmdline_parse_inst_t *)&cmd_config_burst,
        (cmdline_parse_inst_t *)&cmd_config_thresh,
        (cmdline_parse_inst_t *)&cmd_config_threshold,