[v3,1/3] app/flow-perf: support meter policy API
Checks
Commit Message
Add option "policy-mtr" to indicate if meter creation will include policy
or not. Meter creation will keep the same 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 green color
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 Monther <wisamm@nvidia.com>
---
app/test-flow-perf/main.c | 147 ++++++++++++++++++++++++++++++---
doc/guides/tools/flow-perf.rst | 3 +
2 files changed, 137 insertions(+), 13 deletions(-)
Comments
28/10/2021 05:25, Rongwei Liu:
> @@ -854,6 +862,46 @@ args_parse(int argc, char **argv)
> RTE_MAX_LCORE);
> }
> }
> + if (strcmp(lgopts[opt_idx].name, "policy-mtr") == 0) {
> + j = 0;
> + k = 0;
> + arg = optarg;
> + 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 item with no match */
> + if (i >= RTE_DIM(flow_options)) {
> + fprintf(stderr,
> + "Invalid actions "
> + "item: %s\n", token);
> + usage(argv[0]);
> + rte_exit(EXIT_SUCCESS, "Invalid actions item\n");
> + }
> + token = strtok(NULL, ",\0");
> + while (!token && j < RTE_COLORS - 1) {
> + token = strtok(actions_str[++j],
> + ",\0");
> + k = 0;
> + }
> + }
> + }
Could we avoid having so many indents?
Checkpatch suggest considering a refactoring.
[...]
> + fill_actions(actions[i], all_actions[i], 0, 0, 0,
> + 0, 0, 0, unique_data, rx_queues_count);
error: too few arguments to function ‘fill_actions’
That's a rebase issue because I merged first the patch
"app/flow-perf: add destination ports parameter"
HI Tomas:
Flow-perf application run-time options are growing quickly and some of them are a little complex.
Under current architecture, I don't find a valid way to reduce the indention level unless maintainer agree to simply the logic.
For the fill_actions() function, I will rebase it once our github branch updated.
It should be something like:
> > + fill_actions(actions[i], all_actions[i], 0, 0, 0,
> > + 0, 0, 0, unique_data, rx_queues_count, dst_port);
BR
Rongwei
> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> Sent: Friday, November 5, 2021 5:58 PM
> To: Wisam Monther <wisamm@nvidia.com>; Rongwei Liu
> <rongweil@nvidia.com>
> Cc: Matan Azrad <matan@nvidia.com>; Slava Ovsiienko
> <viacheslavo@nvidia.com>; Ori Kam <orika@nvidia.com>; dev@dpdk.org;
> Raslan Darawsheh <rasland@nvidia.com>; Haifei Luo <haifeil@nvidia.com>;
> Jiawei(Jonny) Wang <jiaweiw@nvidia.com>
> Subject: Re: [dpdk-dev] [PATCH v3 1/3] app/flow-perf: support meter policy
> API
>
> External email: Use caution opening links or attachments
>
>
> 28/10/2021 05:25, Rongwei Liu:
> > @@ -854,6 +862,46 @@ args_parse(int argc, char **argv)
> > RTE_MAX_LCORE);
> > }
> > }
> > + if (strcmp(lgopts[opt_idx].name, "policy-mtr") == 0) {
> > + j = 0;
> > + k = 0;
> > + arg = optarg;
> > + 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 item with no match */
> > + if (i >= RTE_DIM(flow_options)) {
> > + fprintf(stderr,
> > + "Invalid actions "
> > + "item: %s\n", token);
> > + usage(argv[0]);
> > + rte_exit(EXIT_SUCCESS, "Invalid actions item\n");
> > + }
> > + token = strtok(NULL, ",\0");
> > + while (!token && j < RTE_COLORS - 1) {
> > + token = strtok(actions_str[++j],
> > + ",\0");
> > + k = 0;
> > + }
> > + }
> > + }
>
> Could we avoid having so many indents?
> Checkpatch suggest considering a refactoring.
>
> [...]
> > + fill_actions(actions[i], all_actions[i], 0, 0, 0,
> > + 0, 0, 0, unique_data, rx_queues_count);
>
> error: too few arguments to function ‘fill_actions’
>
> That's a rebase issue because I merged first the patch
> "app/flow-perf: add destination ports parameter"
>
>
05/11/2021 11:24, Rongwei Liu:
> HI Tomas:
> Flow-perf application run-time options are growing quickly and some of them are a little complex.
> Under current architecture, I don't find a valid way to reduce the indention level unless maintainer agree to simply the logic.
Trust checkpatch, it is possible.
One basic solution is to have sub-functions.
Please do not top-post.
> For the fill_actions() function, I will rebase it once our github branch updated.
> It should be something like:
>
> > > + fill_actions(actions[i], all_actions[i], 0, 0, 0,
> > > + 0, 0, 0, unique_data, rx_queues_count, dst_port);
>
> BR
> Rongwei
>
> > -----Original Message-----
> > From: Thomas Monjalon <thomas@monjalon.net>
> > Sent: Friday, November 5, 2021 5:58 PM
> > To: Wisam Monther <wisamm@nvidia.com>; Rongwei Liu
> > <rongweil@nvidia.com>
> > Cc: Matan Azrad <matan@nvidia.com>; Slava Ovsiienko
> > <viacheslavo@nvidia.com>; Ori Kam <orika@nvidia.com>; dev@dpdk.org;
> > Raslan Darawsheh <rasland@nvidia.com>; Haifei Luo <haifeil@nvidia.com>;
> > Jiawei(Jonny) Wang <jiaweiw@nvidia.com>
> > Subject: Re: [dpdk-dev] [PATCH v3 1/3] app/flow-perf: support meter policy
> > API
> >
> > External email: Use caution opening links or attachments
> >
> >
> > 28/10/2021 05:25, Rongwei Liu:
> > > @@ -854,6 +862,46 @@ args_parse(int argc, char **argv)
> > > RTE_MAX_LCORE);
> > > }
> > > }
> > > + if (strcmp(lgopts[opt_idx].name, "policy-mtr") == 0) {
> > > + j = 0;
> > > + k = 0;
> > > + arg = optarg;
> > > + 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 item with no match */
> > > + if (i >= RTE_DIM(flow_options)) {
> > > + fprintf(stderr,
> > > + "Invalid actions "
> > > + "item: %s\n", token);
> > > + usage(argv[0]);
> > > + rte_exit(EXIT_SUCCESS, "Invalid actions item\n");
> > > + }
> > > + token = strtok(NULL, ",\0");
> > > + while (!token && j < RTE_COLORS - 1) {
> > > + token = strtok(actions_str[++j],
> > > + ",\0");
> > > + k = 0;
> > > + }
> > > + }
> > > + }
> >
> > Could we avoid having so many indents?
> > Checkpatch suggest considering a refactoring.
> >
> > [...]
> > > + fill_actions(actions[i], all_actions[i], 0, 0, 0,
> > > + 0, 0, 0, unique_data, rx_queues_count);
> >
> > error: too few arguments to function ‘fill_actions’
> >
> > That's a rebase issue because I merged first the patch
> > "app/flow-perf: add destination ports parameter"
> >
> >
>
>
@@ -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;
@@ -62,6 +66,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;
@@ -142,7 +147,8 @@ usage(char *progname)
printf(" --portmask=N: hexadecimal bitmask of ports used\n");
printf(" --unique-data: flag to set using unique data for all"
" actions that support data, such as header modify and encap actions\n");
-
+ printf(" --policy-mtr=\"g1,g2:y1:r1\": To create meter with specified "
+ "color actions\n");
printf("To set flow attributes:\n");
printf(" --ingress: set ingress attribute in flows\n");
printf(" --egress: set egress attribute in flows\n");
@@ -242,9 +248,10 @@ args_parse(int argc, char **argv)
char **argvopt;
char *token;
char *end;
+ char *arg;
int n, opt;
int opt_idx;
- size_t i;
+ size_t i, j, k;
static const struct option_dict {
const char *str;
@@ -652,6 +659,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)
@@ -854,6 +862,46 @@ args_parse(int argc, char **argv)
RTE_MAX_LCORE);
}
}
+ if (strcmp(lgopts[opt_idx].name, "policy-mtr") == 0) {
+ j = 0;
+ k = 0;
+ arg = optarg;
+ 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 item with no match */
+ if (i >= RTE_DIM(flow_options)) {
+ fprintf(stderr,
+ "Invalid actions "
+ "item: %s\n", token);
+ usage(argv[0]);
+ rte_exit(EXIT_SUCCESS, "Invalid actions item\n");
+ }
+ token = strtok(NULL, ",\0");
+ while (!token && j < RTE_COLORS - 1) {
+ token = strtok(actions_str[++j],
+ ",\0");
+ k = 0;
+ }
+ }
+ }
break;
default:
usage(argv[0]);
@@ -964,12 +1012,68 @@ 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));
+ 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);
+
+ 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];
+
+ nr_ports = rte_eth_dev_count_avail();
+ for (port_id = 0; port_id < nr_ports; port_id++) {
+ 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, "meter policy add failed port_id %d\n",
+ port_id);
+ policy_id[port_id] = UINT32_MAX;
+ }
+ }
+}
+
+
+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 del policy error(%d) message: %s\n",
+ port_id, error.type,
+ error.message ? error.message : "(no stated reason)");
+ rte_exit(EXIT_FAILURE, "Error: Destroy meter policy Failed!\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(¶ms, 0, sizeof(struct rte_mtr_params));
@@ -979,8 +1083,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, ¶ms, 1, &error);
+ params.meter_profile_id = DEFAULT_METER_PROF_ID;
+
+ if (!policy_mtr) {
+ ret = rte_mtr_create(port_id, counter, ¶ms, 1, &error);
+ } else {
+ params.meter_policy_id = policy_id[port_id];
+ ret = rte_mtr_create(port_id, counter, ¶ms, 0, &error);
+ }
+
if (ret != 0) {
printf("Port %u create meter idx(%d) error(%d) message: %s\n",
port_id, counter, error.type,
@@ -994,11 +1105,17 @@ 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 delete policy %d\n", counter+1);
+ 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 %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");
}
}
@@ -1103,12 +1220,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) {
@@ -1975,16 +2090,22 @@ main(int argc, char **argv)
printf(":: Flows Count per port: %d\n\n", rules_count);
- 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);
@@ -379,3 +379,6 @@ Actions:
* ``--meter``
Add meter action to all flows actions.
Currently, 1 meter profile -> N meter rules -> N rte flows.
+
+* ``--policy-mtr=<str>``
+ Add policy-mtr to create meter with policy and specify policy actions.