d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/ip_pipeline: add meter profile commands

Browse Source 
Add commands to configure the traffic meter profile.

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
This commit is contained in:
Jasvinder Singh 2018-03-29 19:31:58 +01:00 committed by Cristian Dumitrescu
parent c64b9121a9
commit 7e11393e40
3 changed files with 389 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
examples/ip_pipeline/cli.c
View File

@ -3807,6 +3807,218 @@ cmd_pipeline_table_rule_stats_read(char **tokens,
snprintf(out, out_size, MSG_CMD_UNIMPLEM, tokens[0]);
}
/**
* pipeline <pipeline_name> table <table_id> meter profile <meter_profile_id>
* add srtcm cir <cir> cbs <cbs> ebs <ebs>
* | trtcm cir <cir> pir <pir> cbs <cbs> pbs <pbs>
*/
static void
cmd_pipeline_table_meter_profile_add(char **tokens,
uint32_t n_tokens,
char *out,
size_t out_size)
{
struct rte_table_action_meter_profile p;
char *pipeline_name;
uint32_t table_id, meter_profile_id;
int status;
if (n_tokens < 9) {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
}
pipeline_name = tokens[1];
if (strcmp(tokens[2], "table") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "port");
return;
}
if (parser_read_uint32(&table_id, tokens[3]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "table_id");
return;
}
if (strcmp(tokens[4], "meter") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "meter");
return;
}
if (strcmp(tokens[5], "profile") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "profile");
return;
}
if (parser_read_uint32(&meter_profile_id, tokens[6]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "meter_profile_id");
return;
}
if (strcmp(tokens[7], "add") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "add");
return;
}
if (strcmp(tokens[8], "srtcm") == 0) {
if (n_tokens != 15) {
snprintf(out, out_size, MSG_ARG_MISMATCH,
tokens[0]);
return;
}
p.alg = RTE_TABLE_ACTION_METER_SRTCM;
if (strcmp(tokens[9], "cir") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "cir");
return;
}
if (parser_read_uint64(&p.srtcm.cir, tokens[10]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "cir");
return;
}
if (strcmp(tokens[11], "cbs") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "cbs");
return;
}
if (parser_read_uint64(&p.srtcm.cbs, tokens[12]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "cbs");
return;
}
if (strcmp(tokens[13], "ebs") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "ebs");
return;
}
if (parser_read_uint64(&p.srtcm.ebs, tokens[14]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "ebs");
return;
}
} else if (strcmp(tokens[8], "trtcm") == 0) {
if (n_tokens != 17) {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
}
p.alg = RTE_TABLE_ACTION_METER_TRTCM;
if (strcmp(tokens[9], "cir") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "cir");
return;
}
if (parser_read_uint64(&p.trtcm.cir, tokens[10]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "cir");
return;
}
if (strcmp(tokens[11], "pir") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "pir");
return;
}
if (parser_read_uint64(&p.trtcm.pir, tokens[12]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "pir");
return;
}
if (strcmp(tokens[13], "cbs") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "cbs");
return;
}
if (parser_read_uint64(&p.trtcm.cbs, tokens[14]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "cbs");
return;
}
if (strcmp(tokens[15], "pbs") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "pbs");
return;
}
if (parser_read_uint64(&p.trtcm.pbs, tokens[16]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "pbs");
return;
}
} else {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
}
status = pipeline_table_mtr_profile_add(pipeline_name,
table_id,
meter_profile_id,
&p);
if (status) {
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
return;
}
}
/**
* pipeline <pipeline_name> table <table_id>
* meter profile <meter_profile_id> delete
*/
static void
cmd_pipeline_table_meter_profile_delete(char **tokens,
uint32_t n_tokens,
char *out,
size_t out_size)
{
char *pipeline_name;
uint32_t table_id, meter_profile_id;
int status;
if (n_tokens != 8) {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
}
pipeline_name = tokens[1];
if (strcmp(tokens[2], "table") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "port");
return;
}
if (parser_read_uint32(&table_id, tokens[3]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "table_id");
return;
}
if (strcmp(tokens[4], "meter") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "meter");
return;
}
if (strcmp(tokens[5], "profile") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "profile");
return;
}
if (parser_read_uint32(&meter_profile_id, tokens[6]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "meter_profile_id");
return;
}
if (strcmp(tokens[7], "delete") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "delete");
return;
}
status = pipeline_table_mtr_profile_delete(pipeline_name,
table_id,
meter_profile_id);
if (status) {
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
return;
}
}
/**
* thread <thread_id> pipeline <pipeline_name> enable
*/
@ -4116,6 +4328,26 @@ cli_process(char *in, char *out, size_t out_size)
out, out_size);
return;
}
if ((n_tokens >= 8) &&
(strcmp(tokens[2], "table") == 0) &&
(strcmp(tokens[4], "meter") == 0) &&
(strcmp(tokens[5], "profile") == 0) &&
(strcmp(tokens[7], "add") == 0)) {
cmd_pipeline_table_meter_profile_add(tokens, n_tokens,
out, out_size);
return;
}
if ((n_tokens >= 8) &&
(strcmp(tokens[2], "table") == 0) &&
(strcmp(tokens[4], "meter") == 0) &&
(strcmp(tokens[5], "profile") == 0) &&
(strcmp(tokens[7], "delete") == 0)) {
cmd_pipeline_table_meter_profile_delete(tokens,
n_tokens, out, out_size);
return;
}
}
if (strcmp(tokens[0], "thread") == 0) {

11
examples/ip_pipeline/pipeline.h
View File

@ -332,4 +332,15 @@ pipeline_table_rule_stats_read(const char *pipeline_name,
struct rte_table_action_stats_counters *stats,
int clear);
int
pipeline_table_mtr_profile_add(const char *pipeline_name,
uint32_t table_id,
uint32_t meter_profile_id,
struct rte_table_action_meter_profile *profile);
int
pipeline_table_mtr_profile_delete(const char *pipeline_name,
uint32_t table_id,
uint32_t meter_profile_id);
#endif /* _INCLUDE_PIPELINE_H_ */

146
examples/ip_pipeline/thread.c
View File

@ -494,6 +494,8 @@ enum pipeline_req_type {
PIPELINE_REQ_TABLE_RULE_DELETE,
PIPELINE_REQ_TABLE_RULE_DELETE_DEFAULT,
PIPELINE_REQ_TABLE_RULE_STATS_READ,
PIPELINE_REQ_TABLE_MTR_PROFILE_ADD,
PIPELINE_REQ_TABLE_MTR_PROFILE_DELETE,
PIPELINE_REQ_MAX
};
@ -535,6 +537,15 @@ struct pipeline_msg_req_table_rule_stats_read {
int clear;
};
struct pipeline_msg_req_table_mtr_profile_add {
uint32_t meter_profile_id;
struct rte_table_action_meter_profile profile;
};
struct pipeline_msg_req_table_mtr_profile_delete {
uint32_t meter_profile_id;
};
struct pipeline_msg_req {
enum pipeline_req_type type;
uint32_t id; /* Port IN, port OUT or table ID */
@ -549,6 +560,8 @@ struct pipeline_msg_req {
struct pipeline_msg_req_table_rule_add_bulk table_rule_add_bulk;
struct pipeline_msg_req_table_rule_delete table_rule_delete;
struct pipeline_msg_req_table_rule_stats_read table_rule_stats_read;
struct pipeline_msg_req_table_mtr_profile_add table_mtr_profile_add;
struct pipeline_msg_req_table_mtr_profile_delete table_mtr_profile_delete;
};
};
@ -1333,6 +1346,97 @@ pipeline_table_rule_stats_read(const char *pipeline_name,
return status;
}
int
pipeline_table_mtr_profile_add(const char *pipeline_name,
uint32_t table_id,
uint32_t meter_profile_id,
struct rte_table_action_meter_profile *profile)
{
struct pipeline *p;
struct pipeline_msg_req *req;
struct pipeline_msg_rsp *rsp;
int status;
/* Check input params */
if ((pipeline_name == NULL) ||
(profile == NULL))
return -1;
p = pipeline_find(pipeline_name);
if ((p == NULL) ||
(p->enabled == 0) ||
(table_id >= p->n_tables))
return -1;
/* Allocate request */
req = pipeline_msg_alloc();
if (req == NULL)
return -1;
/* Write request */
req->type = PIPELINE_REQ_TABLE_MTR_PROFILE_ADD;
req->id = table_id;
req->table_mtr_profile_add.meter_profile_id = meter_profile_id;
memcpy(&req->table_mtr_profile_add.profile, profile, sizeof(*profile));
/* Send request and wait for response */
rsp = pipeline_msg_send_recv(p, req);
if (rsp == NULL)
return -1;
/* Read response */
status = rsp->status;
/* Free response */
pipeline_msg_free(rsp);
return status;
}
int
pipeline_table_mtr_profile_delete(const char *pipeline_name,
uint32_t table_id,
uint32_t meter_profile_id)
{
struct pipeline *p;
struct pipeline_msg_req *req;
struct pipeline_msg_rsp *rsp;
int status;
/* Check input params */
if (pipeline_name == NULL)
return -1;
p = pipeline_find(pipeline_name);
if ((p == NULL) ||
(p->enabled == 0) ||
(table_id >= p->n_tables))
return -1;
/* Allocate request */
req = pipeline_msg_alloc();
if (req == NULL)
return -1;
/* Write request */
req->type = PIPELINE_REQ_TABLE_MTR_PROFILE_DELETE;
req->id = table_id;
req->table_mtr_profile_delete.meter_profile_id = meter_profile_id;
/* Send request and wait for response */
rsp = pipeline_msg_send_recv(p, req);
if (rsp == NULL)
return -1;
/* Read response */
status = rsp->status;
/* Free response */
pipeline_msg_free(rsp);
return status;
}
/**
* Data plane threads: message handling
*/
@ -2133,6 +2237,40 @@ pipeline_msg_handle_table_rule_stats_read(struct pipeline_data *p,
return rsp;
}
static struct pipeline_msg_rsp *
pipeline_msg_handle_table_mtr_profile_add(struct pipeline_data *p,
struct pipeline_msg_req *req)
{
struct pipeline_msg_rsp *rsp = (struct pipeline_msg_rsp *) req;
uint32_t table_id = req->id;
uint32_t meter_profile_id = req->table_mtr_profile_add.meter_profile_id;
struct rte_table_action_meter_profile *profile =
&req->table_mtr_profile_add.profile;
struct rte_table_action *a = p->table_data[table_id].a;
rsp->status = rte_table_action_meter_profile_add(a,
meter_profile_id,
profile);
return rsp;
}
static struct pipeline_msg_rsp *
pipeline_msg_handle_table_mtr_profile_delete(struct pipeline_data *p,
struct pipeline_msg_req *req)
{
struct pipeline_msg_rsp *rsp = (struct pipeline_msg_rsp *) req;
uint32_t table_id = req->id;
uint32_t meter_profile_id =
req->table_mtr_profile_delete.meter_profile_id;
struct rte_table_action *a = p->table_data[table_id].a;
rsp->status = rte_table_action_meter_profile_delete(a,
meter_profile_id);
return rsp;
}
static void
pipeline_msg_handle(struct pipeline_data *p)
{
@ -2189,6 +2327,14 @@ pipeline_msg_handle(struct pipeline_data *p)
rsp = pipeline_msg_handle_table_rule_stats_read(p, req);
break;
case PIPELINE_REQ_TABLE_MTR_PROFILE_ADD:
rsp = pipeline_msg_handle_table_mtr_profile_add(p, req);
break;
case PIPELINE_REQ_TABLE_MTR_PROFILE_DELETE:
rsp = pipeline_msg_handle_table_mtr_profile_delete(p, req);
break;
default:
rsp = (struct pipeline_msg_rsp *) req;
rsp->status = -1;