app/testpmd: add commands for shaper and wred profiles

Add following CLIs in testpmd application for device traffic management;
- commands to add/del shaper profile for TM hieraqrchy nodes.
- commands to add/update shared shapers
- commands to add/del WRED profiles for TM hiearchy leaf nodes.

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index a0f8303..caf07ba 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -724,6 +724,33 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "show port (port_id) queue-region\n"
                        "    show all queue region related configuration info\n\n"
 
+                       "add port tm node shaper profile (port_id) (shaper_profile_id)"
+                       " (tb_rate) (tb_size) (packet_length_adjust)\n"
+                       "       Add port tm node private shaper profile.\n\n"
+
+                       "del port tm node shaper profile (port_id) (shaper_profile_id)\n"
+                       "       Delete port tm node private shaper profile.\n\n"
+
+                       "add port tm node shared shaper (port_id) (shared_shaper_id)"
+                       " (shaper_profile_id)\n"
+                       "       Add/update port tm node shared shaper.\n\n"
+
+                       "del port tm node shared shaper (port_id) (shared_shaper_id)\n"
+                       "       Delete port tm node shared shaper.\n\n"
+
+                       "set port tm node shaper profile (port_id) (node_id)"
+                       " (shaper_profile_id)\n"
+                       "       Set port tm node shaper profile.\n\n"
+
+                       "add port tm node wred profile (port_id) (wred_profile_id)"
+                       " (color_g) (min_th_g) (max_th_g) (maxp_inv_g) (wq_log2_g)"
+                       " (color_y) (min_th_y) (max_th_y) (maxp_inv_y) (wq_log2_y)"
+                       " (color_r) (min_th_r) (max_th_r) (maxp_inv_r) (wq_log2_r)\n"
+                       "       Add port tm node wred profile.\n\n"
+
+                       "del port tm node wred profile (port_id) (wred_profile_id)\n"
+                       "       Delete port tm node wred profile.\n\n"
+
                        , list_pkt_forwarding_modes()
                );
        }
@@ -15658,6 +15685,13 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_show_port_tm_node_cap,
        (cmdline_parse_inst_t *)&cmd_show_port_tm_node_type,
        (cmdline_parse_inst_t *)&cmd_show_port_tm_node_stats,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_node_shaper_profile,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node_shaper_profile,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_node_shared_shaper,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node_shared_shaper,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_node_wred_profile,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node_wred_profile,
+       (cmdline_parse_inst_t *)&cmd_set_port_tm_node_shaper_profile,
        NULL,
 };
 

diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
index f024372..38048ae 100644 (file)
--- a/app/test-pmd/cmdline_tm.c
+++ b/app/test-pmd/cmdline_tm.c
@@ -679,3 +679,734 @@ cmdline_parse_inst_t cmd_show_port_tm_node_type = {
                NULL,
        },
 };
+
+/* *** Add Port TM Private Shaper Profile *** */
+struct cmd_add_port_tm_node_shaper_profile_result {
+       cmdline_fixed_string_t add;
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t tm;
+       cmdline_fixed_string_t node;
+       cmdline_fixed_string_t shaper;
+       cmdline_fixed_string_t profile;
+       uint16_t port_id;
+       uint32_t shaper_id;
+       uint64_t tb_rate;
+       uint64_t tb_size;
+       uint32_t pktlen_adjust;
+};
+
+cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_add =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result, add, "add");
+cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_port =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result,
+                       port, "port");
+cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_tm =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result,
+                       tm, "tm");
+cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_node =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result,
+                       node, "node");
+cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_shaper =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result,
+                       shaper, "shaper");
+cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_profile =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result,
+                       profile, "profile");
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_port_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result,
+                       port_id, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_shaper_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result,
+                       shaper_id, UINT32);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_tb_rate =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result,
+                       tb_rate, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_tb_size =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result,
+                       tb_size, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_shaper_profile_result,
+                       pktlen_adjust, UINT32);
+
+static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_add_port_tm_node_shaper_profile_result *res = parsed_result;
+       struct rte_tm_shaper_params sp;
+       struct rte_tm_error error;
+       uint32_t shaper_id = res->shaper_id;
+       uint32_t pkt_len_adjust = res->pktlen_adjust;
+       portid_t port_id = res->port_id;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       /* Private shaper profile params */
+       memset(&sp, 0, sizeof(struct rte_tm_shaper_params));
+       sp.peak.rate = res->tb_rate;
+       sp.peak.size = res->tb_size;
+       sp.pkt_length_adjust = pkt_len_adjust;
+
+       ret = rte_tm_shaper_profile_add(port_id, shaper_id, &sp, &error);
+       if (ret != 0) {
+               print_err_msg(&error);
+               return;
+       }
+}
+
+cmdline_parse_inst_t cmd_add_port_tm_node_shaper_profile = {
+       .f = cmd_add_port_tm_node_shaper_profile_parsed,
+       .data = NULL,
+       .help_str = "Add port tm node private shaper profile",
+       .tokens = {
+               (void *)&cmd_add_port_tm_node_shaper_profile_add,
+               (void *)&cmd_add_port_tm_node_shaper_profile_port,
+               (void *)&cmd_add_port_tm_node_shaper_profile_tm,
+               (void *)&cmd_add_port_tm_node_shaper_profile_node,
+               (void *)&cmd_add_port_tm_node_shaper_profile_shaper,
+               (void *)&cmd_add_port_tm_node_shaper_profile_profile,
+               (void *)&cmd_add_port_tm_node_shaper_profile_port_id,
+               (void *)&cmd_add_port_tm_node_shaper_profile_shaper_id,
+               (void *)&cmd_add_port_tm_node_shaper_profile_tb_rate,
+               (void *)&cmd_add_port_tm_node_shaper_profile_tb_size,
+               (void *)&cmd_add_port_tm_node_shaper_profile_pktlen_adjust,
+               NULL,
+       },
+};
+
+/* *** Delete Port TM Private Shaper Profile *** */
+struct cmd_del_port_tm_node_shaper_profile_result {
+       cmdline_fixed_string_t del;
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t tm;
+       cmdline_fixed_string_t node;
+       cmdline_fixed_string_t shaper;
+       cmdline_fixed_string_t profile;
+       uint16_t port_id;
+       uint32_t shaper_id;
+};
+
+cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_del =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shaper_profile_result, del, "del");
+cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_port =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shaper_profile_result,
+                       port, "port");
+cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_tm =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shaper_profile_result, tm, "tm");
+cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_node =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shaper_profile_result,
+                       node, "node");
+cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_shaper =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shaper_profile_result,
+                       shaper, "shaper");
+cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_profile =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shaper_profile_result,
+                       profile, "profile");
+cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_port_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_del_port_tm_node_shaper_profile_result,
+                       port_id, UINT16);
+cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_shaper_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_del_port_tm_node_shaper_profile_result,
+                       shaper_id, UINT32);
+
+static void cmd_del_port_tm_node_shaper_profile_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_del_port_tm_node_shaper_profile_result *res = parsed_result;
+       struct rte_tm_error error;
+       uint32_t shaper_id = res->shaper_id;
+       portid_t port_id = res->port_id;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       ret = rte_tm_shaper_profile_delete(port_id, shaper_id, &error);
+       if (ret != 0) {
+               print_err_msg(&error);
+               return;
+       }
+}
+
+cmdline_parse_inst_t cmd_del_port_tm_node_shaper_profile = {
+       .f = cmd_del_port_tm_node_shaper_profile_parsed,
+       .data = NULL,
+       .help_str = "Delete port tm node private shaper profile",
+       .tokens = {
+               (void *)&cmd_del_port_tm_node_shaper_profile_del,
+               (void *)&cmd_del_port_tm_node_shaper_profile_port,
+               (void *)&cmd_del_port_tm_node_shaper_profile_tm,
+               (void *)&cmd_del_port_tm_node_shaper_profile_node,
+               (void *)&cmd_del_port_tm_node_shaper_profile_shaper,
+               (void *)&cmd_del_port_tm_node_shaper_profile_profile,
+               (void *)&cmd_del_port_tm_node_shaper_profile_port_id,
+               (void *)&cmd_del_port_tm_node_shaper_profile_shaper_id,
+               NULL,
+       },
+};
+
+/* *** Add/Update Port TM shared Shaper *** */
+struct cmd_add_port_tm_node_shared_shaper_result {
+       cmdline_fixed_string_t cmd_type;
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t tm;
+       cmdline_fixed_string_t node;
+       cmdline_fixed_string_t shared;
+       cmdline_fixed_string_t shaper;
+       uint16_t port_id;
+       uint32_t shared_shaper_id;
+       uint32_t shaper_profile_id;
+};
+
+cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_cmd_type =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shared_shaper_result,
+                       cmd_type, "add#set");
+cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_port =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shared_shaper_result, port, "port");
+cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_tm =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shared_shaper_result, tm, "tm");
+cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_node =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shared_shaper_result, node, "node");
+cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shared =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shared_shaper_result,
+                       shared, "shared");
+cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shaper =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_shared_shaper_result,
+                       shaper, "shaper");
+cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_port_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_shared_shaper_result,
+                       port_id, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shared_shaper_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_shared_shaper_result,
+                       shared_shaper_id, UINT32);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shaper_profile_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_shared_shaper_result,
+                       shaper_profile_id, UINT32);
+
+static void cmd_add_port_tm_node_shared_shaper_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_add_port_tm_node_shared_shaper_result *res = parsed_result;
+       struct rte_tm_error error;
+       uint32_t shared_shaper_id = res->shared_shaper_id;
+       uint32_t shaper_profile_id = res->shaper_profile_id;
+       portid_t port_id = res->port_id;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       /* Command type: add */
+       if ((strcmp(res->cmd_type, "add") == 0) &&
+               (port_is_started(port_id))) {
+               printf(" Port %u not stopped (error)\n", port_id);
+               return;
+       }
+
+       /* Command type: set (update) */
+       if ((strcmp(res->cmd_type, "set") == 0) &&
+               (!port_is_started(port_id))) {
+               printf(" Port %u not started (error)\n", port_id);
+               return;
+       }
+
+       ret = rte_tm_shared_shaper_add_update(port_id, shared_shaper_id,
+               shaper_profile_id, &error);
+       if (ret != 0) {
+               print_err_msg(&error);
+               return;
+       }
+}
+
+cmdline_parse_inst_t cmd_add_port_tm_node_shared_shaper = {
+       .f = cmd_add_port_tm_node_shared_shaper_parsed,
+       .data = NULL,
+       .help_str = "add/update port tm node shared shaper",
+       .tokens = {
+               (void *)&cmd_add_port_tm_node_shared_shaper_cmd_type,
+               (void *)&cmd_add_port_tm_node_shared_shaper_port,
+               (void *)&cmd_add_port_tm_node_shared_shaper_tm,
+               (void *)&cmd_add_port_tm_node_shared_shaper_node,
+               (void *)&cmd_add_port_tm_node_shared_shaper_shared,
+               (void *)&cmd_add_port_tm_node_shared_shaper_shaper,
+               (void *)&cmd_add_port_tm_node_shared_shaper_port_id,
+               (void *)&cmd_add_port_tm_node_shared_shaper_shared_shaper_id,
+               (void *)&cmd_add_port_tm_node_shared_shaper_shaper_profile_id,
+               NULL,
+       },
+};
+
+/* *** Delete Port TM shared Shaper *** */
+struct cmd_del_port_tm_node_shared_shaper_result {
+       cmdline_fixed_string_t del;
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t tm;
+       cmdline_fixed_string_t node;
+       cmdline_fixed_string_t shared;
+       cmdline_fixed_string_t shaper;
+       uint16_t port_id;
+       uint32_t shared_shaper_id;
+};
+
+cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_del =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shared_shaper_result, del, "del");
+cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_port =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shared_shaper_result, port, "port");
+cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_tm =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shared_shaper_result, tm, "tm");
+cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_node =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shared_shaper_result, node, "node");
+cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shared =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shared_shaper_result,
+                       shared, "shared");
+cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shaper =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_shared_shaper_result,
+                       shaper, "shaper");
+cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_port_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_del_port_tm_node_shared_shaper_result,
+                       port_id, UINT16);
+cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_shared_shaper_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_del_port_tm_node_shared_shaper_result,
+                       shared_shaper_id, UINT32);
+
+static void cmd_del_port_tm_node_shared_shaper_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_del_port_tm_node_shared_shaper_result *res = parsed_result;
+       struct rte_tm_error error;
+       uint32_t shared_shaper_id = res->shared_shaper_id;
+       portid_t port_id = res->port_id;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       ret = rte_tm_shared_shaper_delete(port_id, shared_shaper_id, &error);
+       if (ret != 0) {
+               print_err_msg(&error);
+               return;
+       }
+}
+
+cmdline_parse_inst_t cmd_del_port_tm_node_shared_shaper = {
+       .f = cmd_del_port_tm_node_shared_shaper_parsed,
+       .data = NULL,
+       .help_str = "delete port tm node shared shaper",
+       .tokens = {
+               (void *)&cmd_del_port_tm_node_shared_shaper_del,
+               (void *)&cmd_del_port_tm_node_shared_shaper_port,
+               (void *)&cmd_del_port_tm_node_shared_shaper_tm,
+               (void *)&cmd_del_port_tm_node_shared_shaper_node,
+               (void *)&cmd_del_port_tm_node_shared_shaper_shared,
+               (void *)&cmd_del_port_tm_node_shared_shaper_shaper,
+               (void *)&cmd_del_port_tm_node_shared_shaper_port_id,
+               (void *)&cmd_del_port_tm_node_shared_shaper_shared_shaper_id,
+               NULL,
+       },
+};
+
+/* *** Add Port TM Node WRED Profile *** */
+struct cmd_add_port_tm_node_wred_profile_result {
+       cmdline_fixed_string_t add;
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t tm;
+       cmdline_fixed_string_t node;
+       cmdline_fixed_string_t wred;
+       cmdline_fixed_string_t profile;
+       uint16_t port_id;
+       uint32_t wred_profile_id;
+       cmdline_fixed_string_t color_g;
+       uint16_t min_th_g;
+       uint16_t max_th_g;
+       uint16_t maxp_inv_g;
+       uint16_t wq_log2_g;
+       cmdline_fixed_string_t color_y;
+       uint16_t min_th_y;
+       uint16_t max_th_y;
+       uint16_t maxp_inv_y;
+       uint16_t wq_log2_y;
+       cmdline_fixed_string_t color_r;
+       uint16_t min_th_r;
+       uint16_t max_th_r;
+       uint16_t maxp_inv_r;
+       uint16_t wq_log2_r;
+};
+
+cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_add =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result, add, "add");
+cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_port =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result, port, "port");
+cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_tm =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result, tm, "tm");
+cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_node =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result, node, "node");
+cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_wred =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result, wred, "wred");
+cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_profile =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       profile, "profile");
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_port_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       port_id, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wred_profile_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       wred_profile_id, UINT32);
+cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       color_g, "G#g");
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       min_th_g, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       max_th_g, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       maxp_inv_g, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_g =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       wq_log2_g, UINT16);
+cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       color_y, "Y#y");
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       min_th_y, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       max_th_y, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       maxp_inv_y, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_y =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       wq_log2_y, UINT16);
+cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       color_r, "R#r");
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       min_th_r, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       max_th_r, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_r =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       maxp_inv_r, UINT16);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_r =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_add_port_tm_node_wred_profile_result,
+                       wq_log2_r, UINT16);
+
+
+static void cmd_add_port_tm_node_wred_profile_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_add_port_tm_node_wred_profile_result *res = parsed_result;
+       struct rte_tm_wred_params wp;
+       enum rte_tm_color color;
+       struct rte_tm_error error;
+       uint32_t wred_profile_id = res->wred_profile_id;
+       portid_t port_id = res->port_id;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       memset(&wp, 0, sizeof(struct rte_tm_wred_params));
+
+       /* WRED Params  (Green Color)*/
+       color = RTE_TM_GREEN;
+       wp.red_params[color].min_th = res->min_th_g;
+       wp.red_params[color].max_th = res->max_th_g;
+       wp.red_params[color].maxp_inv = res->maxp_inv_g;
+       wp.red_params[color].wq_log2 = res->wq_log2_g;
+
+
+       /* WRED Params  (Yellow Color)*/
+       color = RTE_TM_YELLOW;
+       wp.red_params[color].min_th = res->min_th_y;
+       wp.red_params[color].max_th = res->max_th_y;
+       wp.red_params[color].maxp_inv = res->maxp_inv_y;
+       wp.red_params[color].wq_log2 = res->wq_log2_y;
+
+       /* WRED Params  (Red Color)*/
+       color = RTE_TM_RED;
+       wp.red_params[color].min_th = res->min_th_r;
+       wp.red_params[color].max_th = res->max_th_r;
+       wp.red_params[color].maxp_inv = res->maxp_inv_r;
+       wp.red_params[color].wq_log2 = res->wq_log2_r;
+
+       ret = rte_tm_wred_profile_add(port_id, wred_profile_id, &wp, &error);
+       if (ret != 0) {
+               print_err_msg(&error);
+               return;
+       }
+}
+
+cmdline_parse_inst_t cmd_add_port_tm_node_wred_profile = {
+       .f = cmd_add_port_tm_node_wred_profile_parsed,
+       .data = NULL,
+       .help_str = "Add port tm node wred profile",
+       .tokens = {
+               (void *)&cmd_add_port_tm_node_wred_profile_add,
+               (void *)&cmd_add_port_tm_node_wred_profile_port,
+               (void *)&cmd_add_port_tm_node_wred_profile_tm,
+               (void *)&cmd_add_port_tm_node_wred_profile_node,
+               (void *)&cmd_add_port_tm_node_wred_profile_wred,
+               (void *)&cmd_add_port_tm_node_wred_profile_profile,
+               (void *)&cmd_add_port_tm_node_wred_profile_port_id,
+               (void *)&cmd_add_port_tm_node_wred_profile_wred_profile_id,
+               (void *)&cmd_add_port_tm_node_wred_profile_color_g,
+               (void *)&cmd_add_port_tm_node_wred_profile_min_th_g,
+               (void *)&cmd_add_port_tm_node_wred_profile_max_th_g,
+               (void *)&cmd_add_port_tm_node_wred_profile_maxp_inv_g,
+               (void *)&cmd_add_port_tm_node_wred_profile_wq_log2_g,
+               (void *)&cmd_add_port_tm_node_wred_profile_color_y,
+               (void *)&cmd_add_port_tm_node_wred_profile_min_th_y,
+               (void *)&cmd_add_port_tm_node_wred_profile_max_th_y,
+               (void *)&cmd_add_port_tm_node_wred_profile_maxp_inv_y,
+               (void *)&cmd_add_port_tm_node_wred_profile_wq_log2_y,
+               (void *)&cmd_add_port_tm_node_wred_profile_color_r,
+               (void *)&cmd_add_port_tm_node_wred_profile_min_th_r,
+               (void *)&cmd_add_port_tm_node_wred_profile_max_th_r,
+               (void *)&cmd_add_port_tm_node_wred_profile_maxp_inv_r,
+               (void *)&cmd_add_port_tm_node_wred_profile_wq_log2_r,
+               NULL,
+       },
+};
+
+/* *** Delete Port TM node WRED Profile *** */
+struct cmd_del_port_tm_node_wred_profile_result {
+       cmdline_fixed_string_t del;
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t tm;
+       cmdline_fixed_string_t node;
+       cmdline_fixed_string_t wred;
+       cmdline_fixed_string_t profile;
+       uint16_t port_id;
+       uint32_t wred_profile_id;
+};
+
+cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_del =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_wred_profile_result, del, "del");
+cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_port =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_wred_profile_result, port, "port");
+cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_tm =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_wred_profile_result, tm, "tm");
+cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_node =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_wred_profile_result, node, "node");
+cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_wred =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_wred_profile_result, wred, "wred");
+cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_profile =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_del_port_tm_node_wred_profile_result,
+                       profile, "profile");
+cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_port_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_del_port_tm_node_wred_profile_result,
+                       port_id, UINT16);
+cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_wred_profile_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_del_port_tm_node_wred_profile_result,
+                       wred_profile_id, UINT32);
+
+static void cmd_del_port_tm_node_wred_profile_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_del_port_tm_node_wred_profile_result *res = parsed_result;
+       struct rte_tm_error error;
+       uint32_t wred_profile_id = res->wred_profile_id;
+       portid_t port_id = res->port_id;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       ret = rte_tm_wred_profile_delete(port_id, wred_profile_id, &error);
+       if (ret != 0) {
+               print_err_msg(&error);
+               return;
+       }
+}
+
+cmdline_parse_inst_t cmd_del_port_tm_node_wred_profile = {
+       .f = cmd_del_port_tm_node_wred_profile_parsed,
+       .data = NULL,
+       .help_str = "Delete port tm node wred profile",
+       .tokens = {
+               (void *)&cmd_del_port_tm_node_wred_profile_del,
+               (void *)&cmd_del_port_tm_node_wred_profile_port,
+               (void *)&cmd_del_port_tm_node_wred_profile_tm,
+               (void *)&cmd_del_port_tm_node_wred_profile_node,
+               (void *)&cmd_del_port_tm_node_wred_profile_wred,
+               (void *)&cmd_del_port_tm_node_wred_profile_profile,
+               (void *)&cmd_del_port_tm_node_wred_profile_port_id,
+               (void *)&cmd_del_port_tm_node_wred_profile_wred_profile_id,
+               NULL,
+       },
+};
+
+/* *** Update Port TM Node Shaper profile *** */
+struct cmd_set_port_tm_node_shaper_profile_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t tm;
+       cmdline_fixed_string_t node;
+       cmdline_fixed_string_t shaper;
+       cmdline_fixed_string_t profile;
+       uint16_t port_id;
+       uint32_t node_id;
+       uint32_t shaper_profile_id;
+};
+
+cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_set =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_node_shaper_profile_result, set, "set");
+cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_port =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_node_shaper_profile_result,
+                       port, "port");
+cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_tm =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_node_shaper_profile_result, tm, "tm");
+cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_node =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_node_shaper_profile_result,
+                       node, "node");
+cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_shaper =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_node_shaper_profile_result,
+                       shaper, "shaper");
+cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_profile =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_node_shaper_profile_result,
+                       profile, "profile");
+cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_port_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_set_port_tm_node_shaper_profile_result,
+                       port_id, UINT16);
+cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_node_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_shaper_profile_result,
+               node_id, UINT32);
+cmdline_parse_token_num_t
+       cmd_set_port_tm_node_shaper_shaper_profile_profile_id =
+               TOKEN_NUM_INITIALIZER(
+                       struct cmd_set_port_tm_node_shaper_profile_result,
+                       shaper_profile_id, UINT32);
+
+static void cmd_set_port_tm_node_shaper_profile_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_port_tm_node_shaper_profile_result *res = parsed_result;
+       struct rte_tm_error error;
+       uint32_t node_id = res->node_id;
+       uint32_t shaper_profile_id = res->shaper_profile_id;
+       portid_t port_id = res->port_id;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       /* Port status */
+       if (!port_is_started(port_id)) {
+               printf(" Port %u not started (error)\n", port_id);
+               return;
+       }
+
+       ret = rte_tm_node_shaper_update(port_id, node_id,
+               shaper_profile_id, &error);
+       if (ret != 0) {
+               print_err_msg(&error);
+               return;
+       }
+}
+
+cmdline_parse_inst_t cmd_set_port_tm_node_shaper_profile = {
+       .f = cmd_set_port_tm_node_shaper_profile_parsed,
+       .data = NULL,
+       .help_str = "Set port tm node shaper profile",
+       .tokens = {
+               (void *)&cmd_set_port_tm_node_shaper_profile_set,
+               (void *)&cmd_set_port_tm_node_shaper_profile_port,
+               (void *)&cmd_set_port_tm_node_shaper_profile_tm,
+               (void *)&cmd_set_port_tm_node_shaper_profile_node,
+               (void *)&cmd_set_port_tm_node_shaper_profile_shaper,
+               (void *)&cmd_set_port_tm_node_shaper_profile_profile,
+               (void *)&cmd_set_port_tm_node_shaper_profile_port_id,
+               (void *)&cmd_set_port_tm_node_shaper_profile_node_id,
+               (void *)&cmd_set_port_tm_node_shaper_shaper_profile_profile_id,
+               NULL,
+       },
+};

diff --git a/app/test-pmd/cmdline_tm.h b/app/test-pmd/cmdline_tm.h
index 945af89..5ed9de0 100644 (file)
--- a/app/test-pmd/cmdline_tm.h
+++ b/app/test-pmd/cmdline_tm.h
@@ -40,5 +40,12 @@ extern cmdline_parse_inst_t cmd_show_port_tm_level_cap;
 extern cmdline_parse_inst_t cmd_show_port_tm_node_cap;
 extern cmdline_parse_inst_t cmd_show_port_tm_node_type;
 extern cmdline_parse_inst_t cmd_show_port_tm_node_stats;
+extern cmdline_parse_inst_t cmd_add_port_tm_node_shaper_profile;
+extern cmdline_parse_inst_t cmd_del_port_tm_node_shaper_profile;
+extern cmdline_parse_inst_t cmd_add_port_tm_node_shared_shaper;
+extern cmdline_parse_inst_t cmd_del_port_tm_node_shared_shaper;
+extern cmdline_parse_inst_t cmd_add_port_tm_node_wred_profile;
+extern cmdline_parse_inst_t cmd_del_port_tm_node_wred_profile;
+extern cmdline_parse_inst_t cmd_set_port_tm_node_shaper_profile;
 
 #endif /* _CMDLINE_TM_H_ */