net/softnic: add command to read stats
Add cli commands to read port and table stats of softnic pipeline objects. Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com> Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
This commit is contained in:
parent
ee19326a4b
commit
6d4d054025
@ -1499,6 +1499,86 @@ cmd_pipeline_port_in_table(struct pmd_internals *softnic,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* pipeline <pipeline_name> port in <port_id> stats read [clear]
|
||||
*/
|
||||
|
||||
#define MSG_PIPELINE_PORT_IN_STATS \
|
||||
"Pkts in: %" PRIu64 "\n" \
|
||||
"Pkts dropped by AH: %" PRIu64 "\n" \
|
||||
"Pkts dropped by other: %" PRIu64 "\n"
|
||||
|
||||
static void
|
||||
cmd_pipeline_port_in_stats(struct pmd_internals *softnic,
|
||||
char **tokens,
|
||||
uint32_t n_tokens,
|
||||
char *out,
|
||||
size_t out_size)
|
||||
{
|
||||
struct rte_pipeline_port_in_stats stats;
|
||||
char *pipeline_name;
|
||||
uint32_t port_id;
|
||||
int clear, status;
|
||||
|
||||
if (n_tokens != 7 &&
|
||||
n_tokens != 8) {
|
||||
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
|
||||
return;
|
||||
}
|
||||
|
||||
pipeline_name = tokens[1];
|
||||
|
||||
if (strcmp(tokens[2], "port") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "port");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(tokens[3], "in") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "in");
|
||||
return;
|
||||
}
|
||||
|
||||
if (softnic_parser_read_uint32(&port_id, tokens[4]) != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_INVALID, "port_id");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(tokens[5], "stats") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "stats");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(tokens[6], "read") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "read");
|
||||
return;
|
||||
}
|
||||
|
||||
clear = 0;
|
||||
if (n_tokens == 8) {
|
||||
if (strcmp(tokens[7], "clear") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_INVALID, "clear");
|
||||
return;
|
||||
}
|
||||
|
||||
clear = 1;
|
||||
}
|
||||
|
||||
status = softnic_pipeline_port_in_stats_read(softnic,
|
||||
pipeline_name,
|
||||
port_id,
|
||||
&stats,
|
||||
clear);
|
||||
if (status) {
|
||||
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
|
||||
return;
|
||||
}
|
||||
|
||||
snprintf(out, out_size, MSG_PIPELINE_PORT_IN_STATS,
|
||||
stats.stats.n_pkts_in,
|
||||
stats.n_pkts_dropped_by_ah,
|
||||
stats.stats.n_pkts_drop);
|
||||
}
|
||||
|
||||
/**
|
||||
* pipeline <pipeline_name> port in <port_id> enable
|
||||
*/
|
||||
@ -1595,6 +1675,165 @@ cmd_softnic_pipeline_port_in_disable(struct pmd_internals *softnic,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* pipeline <pipeline_name> port out <port_id> stats read [clear]
|
||||
*/
|
||||
#define MSG_PIPELINE_PORT_OUT_STATS \
|
||||
"Pkts in: %" PRIu64 "\n" \
|
||||
"Pkts dropped by AH: %" PRIu64 "\n" \
|
||||
"Pkts dropped by other: %" PRIu64 "\n"
|
||||
|
||||
static void
|
||||
cmd_pipeline_port_out_stats(struct pmd_internals *softnic,
|
||||
char **tokens,
|
||||
uint32_t n_tokens,
|
||||
char *out,
|
||||
size_t out_size)
|
||||
{
|
||||
struct rte_pipeline_port_out_stats stats;
|
||||
char *pipeline_name;
|
||||
uint32_t port_id;
|
||||
int clear, status;
|
||||
|
||||
if (n_tokens != 7 &&
|
||||
n_tokens != 8) {
|
||||
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
|
||||
return;
|
||||
}
|
||||
|
||||
pipeline_name = tokens[1];
|
||||
|
||||
if (strcmp(tokens[2], "port") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "port");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(tokens[3], "out") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "out");
|
||||
return;
|
||||
}
|
||||
|
||||
if (softnic_parser_read_uint32(&port_id, tokens[4]) != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_INVALID, "port_id");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(tokens[5], "stats") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "stats");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(tokens[6], "read") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "read");
|
||||
return;
|
||||
}
|
||||
|
||||
clear = 0;
|
||||
if (n_tokens == 8) {
|
||||
if (strcmp(tokens[7], "clear") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_INVALID, "clear");
|
||||
return;
|
||||
}
|
||||
|
||||
clear = 1;
|
||||
}
|
||||
|
||||
status = softnic_pipeline_port_out_stats_read(softnic,
|
||||
pipeline_name,
|
||||
port_id,
|
||||
&stats,
|
||||
clear);
|
||||
if (status) {
|
||||
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
|
||||
return;
|
||||
}
|
||||
|
||||
snprintf(out, out_size, MSG_PIPELINE_PORT_OUT_STATS,
|
||||
stats.stats.n_pkts_in,
|
||||
stats.n_pkts_dropped_by_ah,
|
||||
stats.stats.n_pkts_drop);
|
||||
}
|
||||
|
||||
/**
|
||||
* pipeline <pipeline_name> table <table_id> stats read [clear]
|
||||
*/
|
||||
#define MSG_PIPELINE_TABLE_STATS \
|
||||
"Pkts in: %" PRIu64 "\n" \
|
||||
"Pkts in with lookup miss: %" PRIu64 "\n" \
|
||||
"Pkts in with lookup hit dropped by AH: %" PRIu64 "\n" \
|
||||
"Pkts in with lookup hit dropped by others: %" PRIu64 "\n" \
|
||||
"Pkts in with lookup miss dropped by AH: %" PRIu64 "\n" \
|
||||
"Pkts in with lookup miss dropped by others: %" PRIu64 "\n"
|
||||
|
||||
static void
|
||||
cmd_pipeline_table_stats(struct pmd_internals *softnic,
|
||||
char **tokens,
|
||||
uint32_t n_tokens,
|
||||
char *out,
|
||||
size_t out_size)
|
||||
{
|
||||
struct rte_pipeline_table_stats stats;
|
||||
char *pipeline_name;
|
||||
uint32_t table_id;
|
||||
int clear, status;
|
||||
|
||||
if (n_tokens != 6 &&
|
||||
n_tokens != 7) {
|
||||
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 (softnic_parser_read_uint32(&table_id, tokens[3]) != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_INVALID, "table_id");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(tokens[4], "stats") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "stats");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(tokens[5], "read") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "read");
|
||||
return;
|
||||
}
|
||||
|
||||
clear = 0;
|
||||
if (n_tokens == 7) {
|
||||
if (strcmp(tokens[6], "clear") != 0) {
|
||||
snprintf(out, out_size, MSG_ARG_INVALID, "clear");
|
||||
return;
|
||||
}
|
||||
|
||||
clear = 1;
|
||||
}
|
||||
|
||||
status = softnic_pipeline_table_stats_read(softnic,
|
||||
pipeline_name,
|
||||
table_id,
|
||||
&stats,
|
||||
clear);
|
||||
if (status) {
|
||||
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
|
||||
return;
|
||||
}
|
||||
|
||||
snprintf(out, out_size, MSG_PIPELINE_TABLE_STATS,
|
||||
stats.stats.n_pkts_in,
|
||||
stats.stats.n_pkts_lookup_miss,
|
||||
stats.n_pkts_dropped_by_lkp_hit_ah,
|
||||
stats.n_pkts_dropped_lkp_hit,
|
||||
stats.n_pkts_dropped_by_lkp_miss_ah,
|
||||
stats.n_pkts_dropped_lkp_miss);
|
||||
}
|
||||
|
||||
/**
|
||||
* <match> ::=
|
||||
*
|
||||
@ -3188,6 +3427,19 @@ cmd_softnic_pipeline_table_rule_delete_default(struct pmd_internals *softnic,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* pipeline <pipeline_name> table <table_id> rule read stats [clear]
|
||||
*/
|
||||
static void
|
||||
cmd_softnic_pipeline_table_rule_stats_read(struct pmd_internals *softnic __rte_unused,
|
||||
char **tokens,
|
||||
uint32_t n_tokens __rte_unused,
|
||||
char *out,
|
||||
size_t out_size)
|
||||
{
|
||||
snprintf(out, out_size, MSG_CMD_UNIMPLEM, tokens[0]);
|
||||
}
|
||||
|
||||
/**
|
||||
* thread <thread_id> pipeline <pipeline_name> enable
|
||||
*/
|
||||
@ -3364,6 +3616,15 @@ softnic_cli_process(char *in, char *out, size_t out_size, void *arg)
|
||||
return;
|
||||
}
|
||||
|
||||
if (n_tokens >= 6 &&
|
||||
(strcmp(tokens[2], "port") == 0) &&
|
||||
(strcmp(tokens[3], "in") == 0) &&
|
||||
(strcmp(tokens[5], "stats") == 0)) {
|
||||
cmd_pipeline_port_in_stats(softnic, tokens, n_tokens,
|
||||
out, out_size);
|
||||
return;
|
||||
}
|
||||
|
||||
if (n_tokens >= 6 &&
|
||||
(strcmp(tokens[2], "port") == 0) &&
|
||||
(strcmp(tokens[3], "in") == 0) &&
|
||||
@ -3382,6 +3643,23 @@ softnic_cli_process(char *in, char *out, size_t out_size, void *arg)
|
||||
return;
|
||||
}
|
||||
|
||||
if (n_tokens >= 6 &&
|
||||
(strcmp(tokens[2], "port") == 0) &&
|
||||
(strcmp(tokens[3], "out") == 0) &&
|
||||
(strcmp(tokens[5], "stats") == 0)) {
|
||||
cmd_pipeline_port_out_stats(softnic, tokens, n_tokens,
|
||||
out, out_size);
|
||||
return;
|
||||
}
|
||||
|
||||
if (n_tokens >= 5 &&
|
||||
(strcmp(tokens[2], "table") == 0) &&
|
||||
(strcmp(tokens[4], "stats") == 0)) {
|
||||
cmd_pipeline_table_stats(softnic, tokens, n_tokens,
|
||||
out, out_size);
|
||||
return;
|
||||
}
|
||||
|
||||
if (n_tokens >= 7 &&
|
||||
(strcmp(tokens[2], "table") == 0) &&
|
||||
(strcmp(tokens[4], "rule") == 0) &&
|
||||
@ -3425,6 +3703,16 @@ softnic_cli_process(char *in, char *out, size_t out_size, void *arg)
|
||||
out, out_size);
|
||||
return;
|
||||
}
|
||||
|
||||
if (n_tokens >= 7 &&
|
||||
(strcmp(tokens[2], "table") == 0) &&
|
||||
(strcmp(tokens[4], "rule") == 0) &&
|
||||
(strcmp(tokens[5], "read") == 0) &&
|
||||
(strcmp(tokens[6], "stats") == 0)) {
|
||||
cmd_softnic_pipeline_table_rule_stats_read(softnic, tokens, n_tokens,
|
||||
out, out_size);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (strcmp(tokens[0], "thread") == 0) {
|
||||
|
@ -764,6 +764,13 @@ struct softnic_table_rule_action {
|
||||
struct rte_table_action_time_params time;
|
||||
};
|
||||
|
||||
int
|
||||
softnic_pipeline_port_in_stats_read(struct pmd_internals *p,
|
||||
const char *pipeline_name,
|
||||
uint32_t port_id,
|
||||
struct rte_pipeline_port_in_stats *stats,
|
||||
int clear);
|
||||
|
||||
int
|
||||
softnic_pipeline_port_in_enable(struct pmd_internals *p,
|
||||
const char *pipeline_name,
|
||||
@ -774,6 +781,20 @@ softnic_pipeline_port_in_disable(struct pmd_internals *p,
|
||||
const char *pipeline_name,
|
||||
uint32_t port_id);
|
||||
|
||||
int
|
||||
softnic_pipeline_port_out_stats_read(struct pmd_internals *p,
|
||||
const char *pipeline_name,
|
||||
uint32_t port_id,
|
||||
struct rte_pipeline_port_out_stats *stats,
|
||||
int clear);
|
||||
|
||||
int
|
||||
softnic_pipeline_table_stats_read(struct pmd_internals *p,
|
||||
const char *pipeline_name,
|
||||
uint32_t table_id,
|
||||
struct rte_pipeline_table_stats *stats,
|
||||
int clear);
|
||||
|
||||
int
|
||||
softnic_pipeline_table_rule_add(struct pmd_internals *p,
|
||||
const char *pipeline_name,
|
||||
@ -809,6 +830,14 @@ softnic_pipeline_table_rule_delete_default(struct pmd_internals *p,
|
||||
const char *pipeline_name,
|
||||
uint32_t table_id);
|
||||
|
||||
int
|
||||
softnic_pipeline_table_rule_stats_read(struct pmd_internals *p,
|
||||
const char *pipeline_name,
|
||||
uint32_t table_id,
|
||||
void *data,
|
||||
struct rte_table_action_stats_counters *stats,
|
||||
int clear);
|
||||
|
||||
/**
|
||||
* Thread
|
||||
*/
|
||||
|
@ -507,19 +507,37 @@ thread_msg_handle(struct softnic_thread_data *t)
|
||||
*/
|
||||
enum pipeline_req_type {
|
||||
/* Port IN */
|
||||
PIPELINE_REQ_PORT_IN_STATS_READ,
|
||||
PIPELINE_REQ_PORT_IN_ENABLE,
|
||||
PIPELINE_REQ_PORT_IN_DISABLE,
|
||||
|
||||
/* Port OUT */
|
||||
PIPELINE_REQ_PORT_OUT_STATS_READ,
|
||||
|
||||
/* Table */
|
||||
PIPELINE_REQ_TABLE_STATS_READ,
|
||||
PIPELINE_REQ_TABLE_RULE_ADD,
|
||||
PIPELINE_REQ_TABLE_RULE_ADD_DEFAULT,
|
||||
PIPELINE_REQ_TABLE_RULE_ADD_BULK,
|
||||
PIPELINE_REQ_TABLE_RULE_DELETE,
|
||||
PIPELINE_REQ_TABLE_RULE_DELETE_DEFAULT,
|
||||
PIPELINE_REQ_TABLE_RULE_STATS_READ,
|
||||
|
||||
PIPELINE_REQ_MAX
|
||||
};
|
||||
|
||||
struct pipeline_msg_req_port_in_stats_read {
|
||||
int clear;
|
||||
};
|
||||
|
||||
struct pipeline_msg_req_port_out_stats_read {
|
||||
int clear;
|
||||
};
|
||||
|
||||
struct pipeline_msg_req_table_stats_read {
|
||||
int clear;
|
||||
};
|
||||
|
||||
struct pipeline_msg_req_table_rule_add {
|
||||
struct softnic_table_rule_match match;
|
||||
struct softnic_table_rule_action action;
|
||||
@ -541,19 +559,40 @@ struct pipeline_msg_req_table_rule_delete {
|
||||
struct softnic_table_rule_match match;
|
||||
};
|
||||
|
||||
struct pipeline_msg_req_table_rule_stats_read {
|
||||
void *data;
|
||||
int clear;
|
||||
};
|
||||
|
||||
struct pipeline_msg_req {
|
||||
enum pipeline_req_type type;
|
||||
uint32_t id; /* Port IN, port OUT or table ID */
|
||||
|
||||
RTE_STD_C11
|
||||
union {
|
||||
struct pipeline_msg_req_port_in_stats_read port_in_stats_read;
|
||||
struct pipeline_msg_req_port_out_stats_read port_out_stats_read;
|
||||
struct pipeline_msg_req_table_stats_read table_stats_read;
|
||||
struct pipeline_msg_req_table_rule_add table_rule_add;
|
||||
struct pipeline_msg_req_table_rule_add_default table_rule_add_default;
|
||||
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_rsp_port_in_stats_read {
|
||||
struct rte_pipeline_port_in_stats stats;
|
||||
};
|
||||
|
||||
struct pipeline_msg_rsp_port_out_stats_read {
|
||||
struct rte_pipeline_port_out_stats stats;
|
||||
};
|
||||
|
||||
struct pipeline_msg_rsp_table_stats_read {
|
||||
struct rte_pipeline_table_stats stats;
|
||||
};
|
||||
|
||||
struct pipeline_msg_rsp_table_rule_add {
|
||||
void *data;
|
||||
};
|
||||
@ -566,14 +605,22 @@ struct pipeline_msg_rsp_table_rule_add_bulk {
|
||||
uint32_t n_rules;
|
||||
};
|
||||
|
||||
struct pipeline_msg_rsp_table_rule_stats_read {
|
||||
struct rte_table_action_stats_counters stats;
|
||||
};
|
||||
|
||||
struct pipeline_msg_rsp {
|
||||
int status;
|
||||
|
||||
RTE_STD_C11
|
||||
union {
|
||||
struct pipeline_msg_rsp_port_in_stats_read port_in_stats_read;
|
||||
struct pipeline_msg_rsp_port_out_stats_read port_out_stats_read;
|
||||
struct pipeline_msg_rsp_table_stats_read table_stats_read;
|
||||
struct pipeline_msg_rsp_table_rule_add table_rule_add;
|
||||
struct pipeline_msg_rsp_table_rule_add_default table_rule_add_default;
|
||||
struct pipeline_msg_rsp_table_rule_add_bulk table_rule_add_bulk;
|
||||
struct pipeline_msg_rsp_table_rule_stats_read table_rule_stats_read;
|
||||
};
|
||||
};
|
||||
|
||||
@ -617,6 +664,63 @@ pipeline_msg_send_recv(struct pipeline *p,
|
||||
return rsp;
|
||||
}
|
||||
|
||||
int
|
||||
softnic_pipeline_port_in_stats_read(struct pmd_internals *softnic,
|
||||
const char *pipeline_name,
|
||||
uint32_t port_id,
|
||||
struct rte_pipeline_port_in_stats *stats,
|
||||
int clear)
|
||||
{
|
||||
struct pipeline *p;
|
||||
struct pipeline_msg_req *req;
|
||||
struct pipeline_msg_rsp *rsp;
|
||||
int status;
|
||||
|
||||
/* Check input params */
|
||||
if (pipeline_name == NULL ||
|
||||
stats == NULL)
|
||||
return -1;
|
||||
|
||||
p = softnic_pipeline_find(softnic, pipeline_name);
|
||||
if (p == NULL ||
|
||||
port_id >= p->n_ports_in)
|
||||
return -1;
|
||||
|
||||
if (!pipeline_is_running(p)) {
|
||||
status = rte_pipeline_port_in_stats_read(p->p,
|
||||
port_id,
|
||||
stats,
|
||||
clear);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/* Allocate request */
|
||||
req = pipeline_msg_alloc();
|
||||
if (req == NULL)
|
||||
return -1;
|
||||
|
||||
/* Write request */
|
||||
req->type = PIPELINE_REQ_PORT_IN_STATS_READ;
|
||||
req->id = port_id;
|
||||
req->port_in_stats_read.clear = clear;
|
||||
|
||||
/* Send request and wait for response */
|
||||
rsp = pipeline_msg_send_recv(p, req);
|
||||
if (rsp == NULL)
|
||||
return -1;
|
||||
|
||||
/* Read response */
|
||||
status = rsp->status;
|
||||
if (status)
|
||||
memcpy(stats, &rsp->port_in_stats_read.stats, sizeof(*stats));
|
||||
|
||||
/* Free response */
|
||||
pipeline_msg_free(rsp);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
int
|
||||
softnic_pipeline_port_in_enable(struct pmd_internals *softnic,
|
||||
const char *pipeline_name,
|
||||
@ -711,6 +815,120 @@ softnic_pipeline_port_in_disable(struct pmd_internals *softnic,
|
||||
return status;
|
||||
}
|
||||
|
||||
int
|
||||
softnic_pipeline_port_out_stats_read(struct pmd_internals *softnic,
|
||||
const char *pipeline_name,
|
||||
uint32_t port_id,
|
||||
struct rte_pipeline_port_out_stats *stats,
|
||||
int clear)
|
||||
{
|
||||
struct pipeline *p;
|
||||
struct pipeline_msg_req *req;
|
||||
struct pipeline_msg_rsp *rsp;
|
||||
int status;
|
||||
|
||||
/* Check input params */
|
||||
if (pipeline_name == NULL ||
|
||||
stats == NULL)
|
||||
return -1;
|
||||
|
||||
p = softnic_pipeline_find(softnic, pipeline_name);
|
||||
if (p == NULL ||
|
||||
port_id >= p->n_ports_out)
|
||||
return -1;
|
||||
|
||||
if (!pipeline_is_running(p)) {
|
||||
status = rte_pipeline_port_out_stats_read(p->p,
|
||||
port_id,
|
||||
stats,
|
||||
clear);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/* Allocate request */
|
||||
req = pipeline_msg_alloc();
|
||||
if (req == NULL)
|
||||
return -1;
|
||||
|
||||
/* Write request */
|
||||
req->type = PIPELINE_REQ_PORT_OUT_STATS_READ;
|
||||
req->id = port_id;
|
||||
req->port_out_stats_read.clear = clear;
|
||||
|
||||
/* Send request and wait for response */
|
||||
rsp = pipeline_msg_send_recv(p, req);
|
||||
if (rsp == NULL)
|
||||
return -1;
|
||||
|
||||
/* Read response */
|
||||
status = rsp->status;
|
||||
if (status)
|
||||
memcpy(stats, &rsp->port_out_stats_read.stats, sizeof(*stats));
|
||||
|
||||
/* Free response */
|
||||
pipeline_msg_free(rsp);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
int
|
||||
softnic_pipeline_table_stats_read(struct pmd_internals *softnic,
|
||||
const char *pipeline_name,
|
||||
uint32_t table_id,
|
||||
struct rte_pipeline_table_stats *stats,
|
||||
int clear)
|
||||
{
|
||||
struct pipeline *p;
|
||||
struct pipeline_msg_req *req;
|
||||
struct pipeline_msg_rsp *rsp;
|
||||
int status;
|
||||
|
||||
/* Check input params */
|
||||
if (pipeline_name == NULL ||
|
||||
stats == NULL)
|
||||
return -1;
|
||||
|
||||
p = softnic_pipeline_find(softnic, pipeline_name);
|
||||
if (p == NULL ||
|
||||
table_id >= p->n_tables)
|
||||
return -1;
|
||||
|
||||
if (!pipeline_is_running(p)) {
|
||||
status = rte_pipeline_table_stats_read(p->p,
|
||||
table_id,
|
||||
stats,
|
||||
clear);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/* Allocate request */
|
||||
req = pipeline_msg_alloc();
|
||||
if (req == NULL)
|
||||
return -1;
|
||||
|
||||
/* Write request */
|
||||
req->type = PIPELINE_REQ_TABLE_STATS_READ;
|
||||
req->id = table_id;
|
||||
req->table_stats_read.clear = clear;
|
||||
|
||||
/* Send request and wait for response */
|
||||
rsp = pipeline_msg_send_recv(p, req);
|
||||
if (rsp == NULL)
|
||||
return -1;
|
||||
|
||||
/* Read response */
|
||||
status = rsp->status;
|
||||
if (status)
|
||||
memcpy(stats, &rsp->table_stats_read.stats, sizeof(*stats));
|
||||
|
||||
/* Free response */
|
||||
pipeline_msg_free(rsp);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
static int
|
||||
match_check(struct softnic_table_rule_match *match,
|
||||
struct pipeline *p,
|
||||
@ -1346,6 +1564,68 @@ softnic_pipeline_table_rule_delete_default(struct pmd_internals *softnic,
|
||||
return status;
|
||||
}
|
||||
|
||||
int
|
||||
softnic_pipeline_table_rule_stats_read(struct pmd_internals *softnic,
|
||||
const char *pipeline_name,
|
||||
uint32_t table_id,
|
||||
void *data,
|
||||
struct rte_table_action_stats_counters *stats,
|
||||
int clear)
|
||||
{
|
||||
struct pipeline *p;
|
||||
struct pipeline_msg_req *req;
|
||||
struct pipeline_msg_rsp *rsp;
|
||||
int status;
|
||||
|
||||
/* Check input params */
|
||||
if (pipeline_name == NULL ||
|
||||
data == NULL ||
|
||||
stats == NULL)
|
||||
return -1;
|
||||
|
||||
p = softnic_pipeline_find(softnic, pipeline_name);
|
||||
if (p == NULL ||
|
||||
table_id >= p->n_tables)
|
||||
return -1;
|
||||
|
||||
if (!pipeline_is_running(p)) {
|
||||
struct rte_table_action *a = p->table[table_id].a;
|
||||
|
||||
status = rte_table_action_stats_read(a,
|
||||
data,
|
||||
stats,
|
||||
clear);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/* Allocate request */
|
||||
req = pipeline_msg_alloc();
|
||||
if (req == NULL)
|
||||
return -1;
|
||||
|
||||
/* Write request */
|
||||
req->type = PIPELINE_REQ_TABLE_RULE_STATS_READ;
|
||||
req->id = table_id;
|
||||
req->table_rule_stats_read.data = data;
|
||||
req->table_rule_stats_read.clear = clear;
|
||||
|
||||
/* Send request and wait for response */
|
||||
rsp = pipeline_msg_send_recv(p, req);
|
||||
if (rsp == NULL)
|
||||
return -1;
|
||||
|
||||
/* Read response */
|
||||
status = rsp->status;
|
||||
if (status)
|
||||
memcpy(stats, &rsp->table_rule_stats_read.stats, sizeof(*stats));
|
||||
|
||||
/* Free response */
|
||||
pipeline_msg_free(rsp);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* Data plane threads: message handling
|
||||
*/
|
||||
@ -1373,6 +1653,22 @@ pipeline_msg_send(struct rte_ring *msgq_rsp,
|
||||
} while (status == -ENOBUFS);
|
||||
}
|
||||
|
||||
static struct pipeline_msg_rsp *
|
||||
pipeline_msg_handle_port_in_stats_read(struct pipeline_data *p,
|
||||
struct pipeline_msg_req *req)
|
||||
{
|
||||
struct pipeline_msg_rsp *rsp = (struct pipeline_msg_rsp *)req;
|
||||
uint32_t port_id = req->id;
|
||||
int clear = req->port_in_stats_read.clear;
|
||||
|
||||
rsp->status = rte_pipeline_port_in_stats_read(p->p,
|
||||
port_id,
|
||||
&rsp->port_in_stats_read.stats,
|
||||
clear);
|
||||
|
||||
return rsp;
|
||||
}
|
||||
|
||||
static struct pipeline_msg_rsp *
|
||||
pipeline_msg_handle_port_in_enable(struct pipeline_data *p,
|
||||
struct pipeline_msg_req *req)
|
||||
@ -1399,6 +1695,38 @@ pipeline_msg_handle_port_in_disable(struct pipeline_data *p,
|
||||
return rsp;
|
||||
}
|
||||
|
||||
static struct pipeline_msg_rsp *
|
||||
pipeline_msg_handle_port_out_stats_read(struct pipeline_data *p,
|
||||
struct pipeline_msg_req *req)
|
||||
{
|
||||
struct pipeline_msg_rsp *rsp = (struct pipeline_msg_rsp *)req;
|
||||
uint32_t port_id = req->id;
|
||||
int clear = req->port_out_stats_read.clear;
|
||||
|
||||
rsp->status = rte_pipeline_port_out_stats_read(p->p,
|
||||
port_id,
|
||||
&rsp->port_out_stats_read.stats,
|
||||
clear);
|
||||
|
||||
return rsp;
|
||||
}
|
||||
|
||||
static struct pipeline_msg_rsp *
|
||||
pipeline_msg_handle_table_stats_read(struct pipeline_data *p,
|
||||
struct pipeline_msg_req *req)
|
||||
{
|
||||
struct pipeline_msg_rsp *rsp = (struct pipeline_msg_rsp *)req;
|
||||
uint32_t port_id = req->id;
|
||||
int clear = req->table_stats_read.clear;
|
||||
|
||||
rsp->status = rte_pipeline_table_stats_read(p->p,
|
||||
port_id,
|
||||
&rsp->table_stats_read.stats,
|
||||
clear);
|
||||
|
||||
return rsp;
|
||||
}
|
||||
|
||||
static int
|
||||
match_convert_ipv6_depth(uint32_t depth, uint32_t *depth32)
|
||||
{
|
||||
@ -1999,6 +2327,24 @@ pipeline_msg_handle_table_rule_delete_default(struct pipeline_data *p,
|
||||
return rsp;
|
||||
}
|
||||
|
||||
static struct pipeline_msg_rsp *
|
||||
pipeline_msg_handle_table_rule_stats_read(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;
|
||||
void *data = req->table_rule_stats_read.data;
|
||||
int clear = req->table_rule_stats_read.clear;
|
||||
struct rte_table_action *a = p->table_data[table_id].a;
|
||||
|
||||
rsp->status = rte_table_action_stats_read(a,
|
||||
data,
|
||||
&rsp->table_rule_stats_read.stats,
|
||||
clear);
|
||||
|
||||
return rsp;
|
||||
}
|
||||
|
||||
static void
|
||||
pipeline_msg_handle(struct pipeline_data *p)
|
||||
{
|
||||
@ -2011,6 +2357,10 @@ pipeline_msg_handle(struct pipeline_data *p)
|
||||
break;
|
||||
|
||||
switch (req->type) {
|
||||
case PIPELINE_REQ_PORT_IN_STATS_READ:
|
||||
rsp = pipeline_msg_handle_port_in_stats_read(p, req);
|
||||
break;
|
||||
|
||||
case PIPELINE_REQ_PORT_IN_ENABLE:
|
||||
rsp = pipeline_msg_handle_port_in_enable(p, req);
|
||||
break;
|
||||
@ -2019,6 +2369,14 @@ pipeline_msg_handle(struct pipeline_data *p)
|
||||
rsp = pipeline_msg_handle_port_in_disable(p, req);
|
||||
break;
|
||||
|
||||
case PIPELINE_REQ_PORT_OUT_STATS_READ:
|
||||
rsp = pipeline_msg_handle_port_out_stats_read(p, req);
|
||||
break;
|
||||
|
||||
case PIPELINE_REQ_TABLE_STATS_READ:
|
||||
rsp = pipeline_msg_handle_table_stats_read(p, req);
|
||||
break;
|
||||
|
||||
case PIPELINE_REQ_TABLE_RULE_ADD:
|
||||
rsp = pipeline_msg_handle_table_rule_add(p, req);
|
||||
break;
|
||||
@ -2039,6 +2397,10 @@ pipeline_msg_handle(struct pipeline_data *p)
|
||||
rsp = pipeline_msg_handle_table_rule_delete_default(p, req);
|
||||
break;
|
||||
|
||||
case PIPELINE_REQ_TABLE_RULE_STATS_READ:
|
||||
rsp = pipeline_msg_handle_table_rule_stats_read(p, req);
|
||||
break;
|
||||
|
||||
default:
|
||||
rsp = (struct pipeline_msg_rsp *)req;
|
||||
rsp->status = -1;
|
||||
|
Loading…
Reference in New Issue
Block a user