app/flow-perf: support meter policy API

Add option "policy-mtr" to indicate if meter creation will include policy
or not. Meter creation will keep unchanged without it.

With "policy-mtr", the policy is introduced. API create_meter_policy
is to create a policy. API create_meter_rule will use it to create
a meter. The value of it is used to specify meter policy actions.

Signed-off-by: Haifei Luo <haifeil@nvidia.com>
Signed-off-by: Jiawei Wang <jiaweiw@nvidia.com>
Signed-off-by: Rongwei Liu <rongweil@nvidia.com>
Acked-by: Wisam Jaddo <wisamm@nvidia.com>

diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c
index 42d13ec495032498c54f8266b3975b1a046e202d..89596eb3f651a0a4cc4b164bd9729cc4bed2ffd6 100644 (file)
--- a/app/test-flow-perf/main.c
+++ b/app/test-flow-perf/main.c
@@ -37,6 +37,7 @@
 #include <rte_mtr.h>
 
 #include "config.h"
+#include "actions_gen.h"
 #include "flow_gen.h"
 
 #define MAX_BATCHES_COUNT          100
@@ -49,10 +50,13 @@ static uint8_t flow_group;
 
 static uint64_t encap_data;
 static uint64_t decap_data;
+static uint64_t all_actions[RTE_COLORS][MAX_ACTIONS_NUM];
+static char *actions_str[RTE_COLORS];
 
 static uint64_t flow_items[MAX_ITEMS_NUM];
 static uint64_t flow_actions[MAX_ACTIONS_NUM];
 static uint64_t flow_attrs[MAX_ATTRS_NUM];
+static uint32_t policy_id[MAX_PORTS];
 static uint8_t items_idx, actions_idx, attrs_idx;
 
 static uint64_t ports_mask;
@@ -63,6 +67,7 @@ static bool delete_flag;
 static bool dump_socket_mem_flag;
 static bool enable_fwd;
 static bool unique_data;
+static bool policy_mtr;
 
 static uint8_t rx_queues_count;
 static uint8_t tx_queues_count;
@@ -560,6 +565,8 @@ usage(char *progname)
                "ipv6 dscp value to be set is random each flow\n");
        printf("  --flag: add flag action to flow actions\n");
        printf("  --meter: add meter action to flow actions\n");
+       printf("  --policy-mtr=\"g1,g2:y1:r1\": to create meter with specified "
+               "colored actions\n");
        printf("  --raw-encap=<data>: add raw encap action to flow actions\n"
                "Data is the data needed to be encaped\n"
                "Example: raw-encap=ether,ipv4,udp,vxlan\n");
@@ -572,6 +579,45 @@ usage(char *progname)
        printf("  --vxlan-decap: add vxlan_decap action to flow actions\n");
 }
 
+static void
+read_meter_policy(char *prog, char *arg)
+{
+       char *token;
+       size_t i, j, k;
+
+       j = 0;
+       k = 0;
+       policy_mtr = true;
+       token = strsep(&arg, ":\0");
+       while (token != NULL && j < RTE_COLORS) {
+               actions_str[j++] = token;
+               token = strsep(&arg, ":\0");
+       }
+       j = 0;
+       token = strtok(actions_str[0], ",\0");
+       while (token == NULL && j < RTE_COLORS - 1)
+               token = strtok(actions_str[++j], ",\0");
+       while (j < RTE_COLORS && token != NULL) {
+               for (i = 0; i < RTE_DIM(flow_options); i++) {
+                       if (!strcmp(token, flow_options[i].str)) {
+                               all_actions[j][k++] = flow_options[i].mask;
+                               break;
+                       }
+               }
+               /* Reached last action with no match */
+               if (i >= RTE_DIM(flow_options)) {
+                       fprintf(stderr, "Invalid colored actions: %s\n", token);
+                       usage(prog);
+                       rte_exit(EXIT_SUCCESS, "Invalid colored actions\n");
+               }
+               token = strtok(NULL, ",\0");
+               while (!token && j < RTE_COLORS - 1) {
+                       token = strtok(actions_str[++j], ",\0");
+                       k = 0;
+               }
+       }
+}
+
 static void
 args_parse(int argc, char **argv)
 {
@@ -660,6 +706,7 @@ args_parse(int argc, char **argv)
                { "raw-decap",                  1, 0, 0 },
                { "vxlan-encap",                0, 0, 0 },
                { "vxlan-decap",                0, 0, 0 },
+               { "policy-mtr",                 1, 0, 0 },
        };
 
        RTE_ETH_FOREACH_DEV(i)
@@ -877,6 +924,8 @@ args_parse(int argc, char **argv)
                                                RTE_MAX_LCORE);
                                }
                        }
+                       if (strcmp(lgopts[opt_idx].name, "policy-mtr") == 0)
+                               read_meter_policy(argv[0], optarg);
                        break;
                default:
                        usage(argv[0]);
@@ -981,7 +1030,6 @@ print_rules_batches(double *cpu_time_per_batch)
        }
 }
 
-
 static inline int
 has_meter(void)
 {
@@ -997,12 +1045,66 @@ has_meter(void)
        return 0;
 }
 
+static void
+create_meter_policy(void)
+{
+       struct rte_mtr_error error;
+       int ret, port_id;
+       struct rte_mtr_meter_policy_params policy;
+       uint16_t nr_ports;
+       struct rte_flow_action actions[RTE_COLORS][MAX_ACTIONS_NUM];
+       int i;
+
+       memset(actions, 0, sizeof(actions));
+       memset(&policy, 0, sizeof(policy));
+       nr_ports = rte_eth_dev_count_avail();
+       for (port_id = 0; port_id < nr_ports; port_id++) {
+               for (i = 0; i < RTE_COLORS; i++)
+                       fill_actions(actions[i], all_actions[i], 0, 0, 0,
+                                    0, 0, 0, unique_data, rx_queues_count,
+                                    dst_ports[port_id]);
+               policy.actions[RTE_COLOR_GREEN] = actions[RTE_COLOR_GREEN];
+               policy.actions[RTE_COLOR_YELLOW] = actions[RTE_COLOR_YELLOW];
+               policy.actions[RTE_COLOR_RED] = actions[RTE_COLOR_RED];
+               policy_id[port_id] = port_id + 10;
+               ret = rte_mtr_meter_policy_add(port_id, policy_id[port_id],
+                                              &policy, &error);
+               if (ret) {
+                       fprintf(stderr, "port %d: failed to create meter policy\n",
+                               port_id);
+                       policy_id[port_id] = UINT32_MAX;
+               }
+               memset(actions, 0, sizeof(actions));
+       }
+}
+
+static void
+destroy_meter_policy(void)
+{
+       struct rte_mtr_error error;
+       uint16_t nr_ports;
+       int port_id;
+
+       nr_ports = rte_eth_dev_count_avail();
+       for (port_id = 0; port_id < nr_ports; port_id++) {
+               /* If port outside portmask */
+               if (!((ports_mask >> port_id) & 0x1))
+                       continue;
+
+               if (rte_mtr_meter_policy_delete
+                       (port_id, policy_id[port_id], &error)) {
+                       fprintf(stderr, "port %u:  failed to  delete meter policy\n",
+                               port_id);
+                       rte_exit(EXIT_FAILURE, "Error: Failed to delete meter policy.\n");
+               }
+       }
+}
+
 static void
 create_meter_rule(int port_id, uint32_t counter)
 {
        int ret;
        struct rte_mtr_params params;
-       uint32_t default_prof_id = 100;
        struct rte_mtr_error error;
 
        memset(&params, 0, sizeof(struct rte_mtr_params));
@@ -1012,8 +1114,15 @@ create_meter_rule(int port_id, uint32_t counter)
        params.dscp_table = NULL;
 
        /*create meter*/
-       params.meter_profile_id = default_prof_id;
-       ret = rte_mtr_create(port_id, counter, &params, 1, &error);
+       params.meter_profile_id = DEFAULT_METER_PROF_ID;
+
+       if (!policy_mtr) {
+               ret = rte_mtr_create(port_id, counter, &params, 1, &error);
+       } else {
+               params.meter_policy_id = policy_id[port_id];
+               ret = rte_mtr_create(port_id, counter, &params, 0, &error);
+       }
+
        if (ret != 0) {
                printf("Port %u create meter idx(%d) error(%d) message: %s\n",
                        port_id, counter, error.type,
@@ -1027,11 +1136,16 @@ destroy_meter_rule(int port_id, uint32_t counter)
 {
        struct rte_mtr_error error;
 
+       if (policy_mtr && policy_id[port_id] != UINT32_MAX) {
+               if (rte_mtr_meter_policy_delete(port_id, policy_id[port_id],
+                                       &error))
+                       fprintf(stderr, "Error: Failed to delete meter policy\n");
+               policy_id[port_id] = UINT32_MAX;
+       }
        if (rte_mtr_destroy(port_id, counter, &error)) {
-               printf("Port %u destroy meter(%d) error(%d) message: %s\n",
-                       port_id, counter, error.type,
-                       error.message ? error.message : "(no stated reason)");
-               rte_exit(EXIT_FAILURE, "Error in deleting meter rule\n");
+               fprintf(stderr, "Port %d: Failed to delete meter.\n",
+                               port_id);
+               rte_exit(EXIT_FAILURE, "Error in deleting meter rule");
        }
 }
 
@@ -1136,12 +1250,10 @@ create_meter_profile(void)
                /* If port outside portmask */
                if (!((ports_mask >> port_id) & 0x1))
                        continue;
-
                mp.alg = RTE_MTR_SRTCM_RFC2697;
                mp.srtcm_rfc2697.cir = METER_CIR;
                mp.srtcm_rfc2697.cbs = METER_CIR / 8;
                mp.srtcm_rfc2697.ebs = 0;
-
                ret = rte_mtr_meter_profile_add
                        (port_id, DEFAULT_METER_PROF_ID, &mp, &error);
                if (ret != 0) {
@@ -2012,16 +2124,22 @@ main(int argc, char **argv)
 
        rte_srand(rand_seed);
 
-       if (has_meter())
+       if (has_meter()) {
                create_meter_profile();
+               if (policy_mtr)
+                       create_meter_policy();
+       }
        rte_eal_mp_remote_launch(run_rte_flow_handler_cores, NULL, CALL_MAIN);
 
        if (enable_fwd) {
                init_lcore_info();
                rte_eal_mp_remote_launch(start_forwarding, NULL, CALL_MAIN);
        }
-       if (has_meter() && delete_flag)
+       if (has_meter() && delete_flag) {
                destroy_meter_profile();
+               if (policy_mtr)
+                       destroy_meter_policy();
+       }
 
        RTE_ETH_FOREACH_DEV(port) {
                rte_flow_flush(port, &error);

diff --git a/doc/guides/tools/flow-perf.rst b/doc/guides/tools/flow-perf.rst
index 7d986f0158831b3822d56403ead5824d60461b4f..e4083f053e772b3e047bd78cc4c2a36b777f5f06 100644 (file)
--- a/doc/guides/tools/flow-perf.rst
+++ b/doc/guides/tools/flow-perf.rst
@@ -384,6 +384,10 @@ Actions:
 *      ``--vxlan-decap``
        Add vxlan decap action to all flows actions.
 
+*      ``--policy-mtr=<str>``
+       Add policy-mtr to create meter with policy and specify policy actions.
+       Example: policy-mtr=rss,mark::drop
+
 *       ``--meter``
         Add meter action to all flows actions.
         Currently, 1 meter profile -> N meter rules -> N rte flows.