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

app/testpmd: support indirect counter action query

Browse Source 
Counter action query was implemented as part of flow query, but was not
implemented as part of indirect action query.

This patch adds the required implementation.

Signed-off-by: Michael Baum <michaelba@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
This commit is contained in:
Michael Baum 2021-04-29 12:55:40 +03:00 committed by Ferruh Yigit
parent 0f6beb151f
commit cc492aa595
1 changed files with 77 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
app/test-pmd/config.c
View File

@ -1618,43 +1618,51 @@ port_action_handle_query(portid_t port_id, uint32_t id)
{ {
struct rte_flow_error error; struct rte_flow_error error;
struct port_indirect_action *pia; struct port_indirect_action *pia;
uint64_t default_data; union {
void *data = NULL; struct rte_flow_query_count count;
int ret = 0; struct rte_flow_query_age age;
struct rte_flow_action_conntrack ct;
} query;
pia = action_get_by_id(port_id, id); pia = action_get_by_id(port_id, id);
if (!pia) if (!pia)
return -EINVAL; return -EINVAL;
switch (pia->type) { switch (pia->type) {
case RTE_FLOW_ACTION_TYPE_AGE: case RTE_FLOW_ACTION_TYPE_AGE:
data = &default_data; case RTE_FLOW_ACTION_TYPE_COUNT:
break; break;
default: default:
printf("Indirect action %u (type: %d) on port %u doesn't" printf("Indirect action %u (type: %d) on port %u doesn't support query\n",
" support query\n", id, pia->type, port_id); id, pia->type, port_id);
return -1; return -ENOTSUP;
} }
if (rte_flow_action_handle_query(port_id, pia->handle, data, &error)) /* Poisoning to make sure PMDs update it in case of error. */
ret = port_flow_complain(&error); memset(&error, 0x55, sizeof(error));
memset(&query, 0, sizeof(query));
if (rte_flow_action_handle_query(port_id, pia->handle, &query, &error))
return port_flow_complain(&error);
switch (pia->type) { switch (pia->type) {
case RTE_FLOW_ACTION_TYPE_AGE: case RTE_FLOW_ACTION_TYPE_AGE:
if (!ret) { printf("Indirect AGE action:\n"
struct rte_flow_query_age *resp = data;
printf("AGE:\n"
" aged: %u\n" " aged: %u\n"
" sec_since_last_hit_valid: %u\n" " sec_since_last_hit_valid: %u\n"
" sec_since_last_hit: %" PRIu32 "\n", " sec_since_last_hit: %" PRIu32 "\n",
resp->aged, query.age.aged,
resp->sec_since_last_hit_valid, query.age.sec_since_last_hit_valid,
resp->sec_since_last_hit); query.age.sec_since_last_hit);
} break;
data = NULL; case RTE_FLOW_ACTION_TYPE_COUNT:
printf("Indirect COUNT action:\n"
" hits_set: %u\n"
" bytes_set: %u\n"
" hits: %" PRIu64 "\n"
" bytes: %" PRIu64 "\n",
query.count.hits_set,
query.count.bytes_set,
query.count.hits,
query.count.bytes);
break; break;
case RTE_FLOW_ACTION_TYPE_CONNTRACK: case RTE_FLOW_ACTION_TYPE_CONNTRACK:
if (!ret) {
struct rte_flow_action_conntrack *ct = data;
printf("Conntrack Context:\n" printf("Conntrack Context:\n"
" Peer: %u, Flow dir: %s, Enable: %u\n" " Peer: %u, Flow dir: %s, Enable: %u\n"
" Live: %u, SACK: %u, CACK: %u\n" " Live: %u, SACK: %u, CACK: %u\n"
@ -1662,46 +1670,47 @@ port_action_handle_query(portid_t port_id, uint32_t id)
" Factor: %u, Retrans: %u, TCP flags: %u\n" " Factor: %u, Retrans: %u, TCP flags: %u\n"
" Last Seq: %u, Last ACK: %u\n" " Last Seq: %u, Last ACK: %u\n"
" Last Win: %u, Last End: %u\n", " Last Win: %u, Last End: %u\n",
ct->peer_port, query.ct.peer_port,
ct->is_original_dir ? "Original" : "Reply", query.ct.is_original_dir ? "Original" : "Reply",
ct->enable, ct->live_connection, query.ct.enable, query.ct.live_connection,
ct->selective_ack, ct->challenge_ack_passed, query.ct.selective_ack, query.ct.challenge_ack_passed,
ct->last_direction ? "Original" : "Reply", query.ct.last_direction ? "Original" : "Reply",
ct->liberal_mode, ct->state, query.ct.liberal_mode, query.ct.state,
ct->max_ack_window, ct->retransmission_limit, query.ct.max_ack_window, query.ct.retransmission_limit,
ct->last_index, ct->last_seq, ct->last_ack, query.ct.last_index, query.ct.last_seq,
ct->last_window, ct->last_end); query.ct.last_ack, query.ct.last_window,
query.ct.last_end);
printf(" Original Dir:\n" printf(" Original Dir:\n"
" scale: %u, fin: %u, ack seen: %u\n" " scale: %u, fin: %u, ack seen: %u\n"
" unacked data: %u\n Sent end: %u," " unacked data: %u\n Sent end: %u,"
" Reply end: %u, Max win: %u, Max ACK: %u\n", " Reply end: %u, Max win: %u, Max ACK: %u\n",
ct->original_dir.scale, query.ct.original_dir.scale,
ct->original_dir.close_initiated, query.ct.original_dir.close_initiated,
ct->original_dir.last_ack_seen, query.ct.original_dir.last_ack_seen,
ct->original_dir.data_unacked, query.ct.original_dir.data_unacked,
ct->original_dir.sent_end, query.ct.original_dir.sent_end,
ct->original_dir.reply_end, query.ct.original_dir.reply_end,
ct->original_dir.max_win, query.ct.original_dir.max_win,
ct->original_dir.max_ack); query.ct.original_dir.max_ack);
printf(" Reply Dir:\n" printf(" Reply Dir:\n"
" scale: %u, fin: %u, ack seen: %u\n" " scale: %u, fin: %u, ack seen: %u\n"
" unacked data: %u\n Sent end: %u," " unacked data: %u\n Sent end: %u,"
" Reply end: %u, Max win: %u, Max ACK: %u\n", " Reply end: %u, Max win: %u, Max ACK: %u\n",
ct->reply_dir.scale, query.ct.reply_dir.scale,
ct->reply_dir.close_initiated, query.ct.reply_dir.close_initiated,
ct->reply_dir.last_ack_seen, query.ct.reply_dir.last_ack_seen,
ct->reply_dir.data_unacked, query.ct.reply_dir.data_unacked,
ct->reply_dir.sent_end, ct->reply_dir.reply_end, query.ct.reply_dir.sent_end,
ct->reply_dir.max_win, ct->reply_dir.max_ack); query.ct.reply_dir.reply_end,
} query.ct.reply_dir.max_win,
data = NULL; query.ct.reply_dir.max_ack);
break; break;
default: default:
printf("Indirect action %u (type: %d) on port %u doesn't" printf("Indirect action %u (type: %d) on port %u doesn't support query\n",
" support query\n", id, pia->type, port_id); id, pia->type, port_id);
ret = -1; break;
} }
return ret; return 0;
} }
static struct port_flow_tunnel * static struct port_flow_tunnel *