app/testpmd: add command for VF VLAN tag on i40e

command is: set vf vlan tag port_id vf_id on|off

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
Acked-by: Helin Zhang <helin.zhang@intel.com>
Acked-by: Vincent Jardin <vincent.jardin@6wind.com>

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index ea8dde4..0f542ae 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -312,6 +312,9 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "set vf vlan antispoof (port_id) (vf_id) (on|off)\n"
                        "    Set VLAN antispoof for a VF from the PF.\n\n"
 
+                       "set vf vlan tag (port_id) (vf_id) (on|off)\n"
+                       "    Set VLAN tag for a VF from the PF.\n\n"
+
                        "vlan set filter (on|off) (port_id)\n"
                        "    Set the VLAN filter on a port.\n\n"
 
@@ -12266,6 +12269,101 @@ cmdline_parse_inst_t cmd_set_vf_broadcast = {
        },
 };
 
+/* vf vlan tag configuration */
+
+/* Common result structure for vf vlan tag */
+struct cmd_set_vf_vlan_tag_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t vlan;
+       cmdline_fixed_string_t tag;
+       uint8_t port_id;
+       uint16_t vf_id;
+       cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for vf vlan tag enable disable */
+cmdline_parse_token_string_t cmd_set_vf_vlan_tag_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_set_vf_vlan_tag_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_set_vf_vlan_tag_vlan =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                vlan, "vlan");
+cmdline_parse_token_string_t cmd_set_vf_vlan_tag_tag =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                tag, "tag");
+cmdline_parse_token_num_t cmd_set_vf_vlan_tag_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                port_id, UINT8);
+cmdline_parse_token_num_t cmd_set_vf_vlan_tag_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                vf_id, UINT16);
+cmdline_parse_token_string_t cmd_set_vf_vlan_tag_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                on_off, "on#off");
+
+static void
+cmd_set_vf_vlan_tag_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_vf_vlan_tag_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       __rte_unused int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_set_vf_vlan_tag(res->port_id,
+                                          res->vf_id, is_on);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d or is_on %d\n", res->vf_id, is_on);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_vlan_tag = {
+       .f = cmd_set_vf_vlan_tag_parsed,
+       .data = NULL,
+       .help_str = "set vf vlan tag <port_id> <vf_id> on|off",
+       .tokens = {
+               (void *)&cmd_set_vf_vlan_tag_set,
+               (void *)&cmd_set_vf_vlan_tag_vf,
+               (void *)&cmd_set_vf_vlan_tag_vlan,
+               (void *)&cmd_set_vf_vlan_tag_tag,
+               (void *)&cmd_set_vf_vlan_tag_port_id,
+               (void *)&cmd_set_vf_vlan_tag_vf_id,
+               (void *)&cmd_set_vf_vlan_tag_on_off,
+               NULL,
+       },
+};
+
 /* ******************************************************************************** */
 
 /* list of instructions */
@@ -12440,6 +12538,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_set_vf_promisc,
        (cmdline_parse_inst_t *)&cmd_set_vf_allmulti,
        (cmdline_parse_inst_t *)&cmd_set_vf_broadcast,
+       (cmdline_parse_inst_t *)&cmd_set_vf_vlan_tag,
        NULL,
 };
 

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 8367052..16ac097 100644 (file)
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -574,6 +574,13 @@ Set VLAN insert for a VF from the PF::
 
    testpmd> set vf vlan insert (port_id) (vf_id) (vlan_id)
 
+vlan set tag (for VF)
+~~~~~~~~~~~~~~~~~~~~~
+
+Set VLAN tag for a VF from the PF::
+
+   testpmd> set vf vlan tag (port_id) (vf_id) (on|off)
+
 vlan set antispoof (for VF)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~