matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

devlink: Make match/action parsing more flexible 

This patch decouples the match/action parsing from printing. This is
done as a preparation for adding the ability to print global header
values, for example print IPv4 address, which require special formatting.

Signed-off-by: Arkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
This commit is contained in:
Arkadi Sharshevsky 2017-09-07 17:26:40 +03:00 committed by Stephen Hemminger
parent 50ea3c6438
commit 92b2a5bb76
1 changed files with 80 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
devlink/devlink.c
View File

@ -3077,27 +3077,42 @@ static const char
} }
} }
static void pr_out_dpipe_action(struct dpipe_ctx *ctx, struct dpipe_op_info {
uint32_t header_id, uint32_t field_id, uint32_t header_id;
uint32_t action_type, bool global) uint32_t field_id;
bool header_global;
};
struct dpipe_action {
struct dpipe_op_info info;
uint32_t type;
};
static void pr_out_dpipe_action(struct dpipe_action *action,
struct dpipe_ctx *ctx)
{ {
struct dpipe_op_info *op_info = &action->info;
const char *mapping; const char *mapping;
pr_out_str(ctx->dl, "type", dpipe_action_type_e2s(action_type)); pr_out_str(ctx->dl, "type",
pr_out_str(ctx->dl, "header", dpipe_header_id2s(ctx, header_id, dpipe_action_type_e2s(action->type));
global)); pr_out_str(ctx->dl, "header",
pr_out_str(ctx->dl, "field", dpipe_field_id2s(ctx, header_id, field_id, dpipe_header_id2s(ctx, op_info->header_id,
global)); op_info->header_global));
mapping = dpipe_mapping_get(ctx, header_id, field_id, global); pr_out_str(ctx->dl, "field",
dpipe_field_id2s(ctx, op_info->header_id,
op_info->field_id,
op_info->header_global));
mapping = dpipe_mapping_get(ctx, op_info->header_id,
op_info->field_id,
op_info->header_global);
if (mapping) if (mapping)
pr_out_str(ctx->dl, "mapping", mapping); pr_out_str(ctx->dl, "mapping", mapping);
} }
static int dpipe_action_show(struct dpipe_ctx *ctx, struct nlattr *nl) static int dpipe_action_parse(struct dpipe_action *action, struct nlattr *nl)
{ {
struct nlattr *nla_action[DEVLINK_ATTR_MAX + 1] = {}; struct nlattr *nla_action[DEVLINK_ATTR_MAX + 1] = {};
uint32_t header_id, field_id, action_type;
bool global;
int err; int err;
err = mnl_attr_parse_nested(nl, attr_cb, nla_action); err = mnl_attr_parse_nested(nl, attr_cb, nla_action);
@ -3111,12 +3126,11 @@ static int dpipe_action_show(struct dpipe_ctx *ctx, struct nlattr *nl)
return -EINVAL; return -EINVAL;
} }
header_id = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_HEADER_ID]); action->type = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_ACTION_TYPE]);
field_id = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_FIELD_ID]); action->info.header_id = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_HEADER_ID]);
action_type = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_ACTION_TYPE]); action->info.field_id = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_FIELD_ID]);
global = !!mnl_attr_get_u8(nla_action[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]); action->info.header_global = !!mnl_attr_get_u8(nla_action[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]);
pr_out_dpipe_action(ctx, header_id, field_id, action_type, global);
return 0; return 0;
} }
@ -3124,16 +3138,18 @@ static int dpipe_table_actions_show(struct dpipe_ctx *ctx,
struct nlattr *nla_actions) struct nlattr *nla_actions)
{ {
struct nlattr *nla_action; struct nlattr *nla_action;
struct dpipe_action action;
mnl_attr_for_each_nested(nla_action, nla_actions) { mnl_attr_for_each_nested(nla_action, nla_actions) {
pr_out_entry_start(ctx->dl); pr_out_entry_start(ctx->dl);
if (dpipe_action_show(ctx, nla_action)) if (dpipe_action_parse(&action, nla_action))
goto err_action_show; goto err_action_parse;
pr_out_dpipe_action(&action, ctx);
pr_out_entry_end(ctx->dl); pr_out_entry_end(ctx->dl);
} }
return 0; return 0;
err_action_show: err_action_parse:
pr_out_entry_end(ctx->dl); pr_out_entry_end(ctx->dl);
return -EINVAL; return -EINVAL;
} }
@ -3149,28 +3165,38 @@ dpipe_match_type_e2s(enum devlink_dpipe_match_type match_type)
} }
} }
static void pr_out_dpipe_match(struct dpipe_ctx *ctx, struct dpipe_match {
uint32_t header_id, uint32_t field_id, struct dpipe_op_info info;
uint32_t match_type, bool global) uint32_t type;
};
static void pr_out_dpipe_match(struct dpipe_match *match,
struct dpipe_ctx *ctx)
{ {
struct dpipe_op_info *op_info = &match->info;
const char *mapping; const char *mapping;
pr_out_str(ctx->dl, "type", dpipe_match_type_e2s(match_type)); pr_out_str(ctx->dl, "type",
pr_out_str(ctx->dl, "header", dpipe_header_id2s(ctx, header_id, dpipe_match_type_e2s(match->type));
global)); pr_out_str(ctx->dl, "header",
pr_out_str(ctx->dl, "field", dpipe_field_id2s(ctx, header_id, field_id, dpipe_header_id2s(ctx, op_info->header_id,
global)); op_info->header_global));
mapping = dpipe_mapping_get(ctx, header_id, field_id, global); pr_out_str(ctx->dl, "field",
dpipe_field_id2s(ctx, op_info->header_id,
op_info->field_id,
op_info->header_global));
mapping = dpipe_mapping_get(ctx, op_info->header_id,
op_info->field_id,
op_info->header_global);
if (mapping) if (mapping)
pr_out_str(ctx->dl, "mapping", mapping); pr_out_str(ctx->dl, "mapping", mapping);
} }
static int dpipe_match_show(struct dpipe_ctx *ctx, struct nlattr *nl) static int dpipe_match_parse(struct dpipe_match *match,
struct nlattr *nl)
{ {
struct nlattr *nla_match[DEVLINK_ATTR_MAX + 1] = {}; struct nlattr *nla_match[DEVLINK_ATTR_MAX + 1] = {};
uint32_t header_id, field_id, match_type;
bool global;
int err; int err;
err = mnl_attr_parse_nested(nl, attr_cb, nla_match); err = mnl_attr_parse_nested(nl, attr_cb, nla_match);
@ -3184,12 +3210,11 @@ static int dpipe_match_show(struct dpipe_ctx *ctx, struct nlattr *nl)
return -EINVAL; return -EINVAL;
} }
match_type = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_MATCH_TYPE]); match->type = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_MATCH_TYPE]);
header_id = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_HEADER_ID]); match->info.header_id = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_HEADER_ID]);
field_id = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_FIELD_ID]); match->info.field_id = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_FIELD_ID]);
global = !!mnl_attr_get_u8(nla_match[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]); match->info.header_global = !!mnl_attr_get_u8(nla_match[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]);
pr_out_dpipe_match(ctx, header_id, field_id, match_type, global);
return 0; return 0;
} }
@ -3197,16 +3222,18 @@ static int dpipe_table_matches_show(struct dpipe_ctx *ctx,
struct nlattr *nla_matches) struct nlattr *nla_matches)
{ {
struct nlattr *nla_match; struct nlattr *nla_match;
struct dpipe_match match;
mnl_attr_for_each_nested(nla_match, nla_matches) { mnl_attr_for_each_nested(nla_match, nla_matches) {
pr_out_entry_start(ctx->dl); pr_out_entry_start(ctx->dl);
if (dpipe_match_show(ctx, nla_match)) if (dpipe_match_parse(&match, nla_match))
goto err_match_show; goto err_match_parse;
pr_out_dpipe_match(&match, ctx);
pr_out_entry_end(ctx->dl); pr_out_entry_end(ctx->dl);
} }
return 0; return 0;
err_match_show: err_match_parse:
pr_out_entry_end(ctx->dl); pr_out_entry_end(ctx->dl);
return -EINVAL; return -EINVAL;
} }
@ -3382,6 +3409,7 @@ static int dpipe_entry_match_value_show(struct dpipe_ctx *ctx,
struct nlattr *nl) struct nlattr *nl)
{ {
struct nlattr *nla_match_value[DEVLINK_ATTR_MAX + 1] = {}; struct nlattr *nla_match_value[DEVLINK_ATTR_MAX + 1] = {};
struct dpipe_match match;
int err; int err;
err = mnl_attr_parse_nested(nl, attr_cb, nla_match_value); err = mnl_attr_parse_nested(nl, attr_cb, nla_match_value);
@ -3394,16 +3422,18 @@ static int dpipe_entry_match_value_show(struct dpipe_ctx *ctx,
} }
pr_out_entry_start(ctx->dl); pr_out_entry_start(ctx->dl);
if (dpipe_match_show(ctx, nla_match_value[DEVLINK_ATTR_DPIPE_MATCH])) if (dpipe_match_parse(&match,
goto err_match_show; nla_match_value[DEVLINK_ATTR_DPIPE_MATCH]))
goto err_match_parse;
pr_out_dpipe_match(&match, ctx);
if (dpipe_entry_value_show(ctx, nla_match_value)) if (dpipe_entry_value_show(ctx, nla_match_value))
goto err_value_show; goto err_value_show;
pr_out_entry_end(ctx->dl); pr_out_entry_end(ctx->dl);
return 0; return 0;
err_match_show:
err_value_show: err_value_show:
err_match_parse:
pr_out_entry_end(ctx->dl); pr_out_entry_end(ctx->dl);
return -EINVAL; return -EINVAL;
} }
@ -3412,6 +3442,7 @@ static int dpipe_entry_action_value_show(struct dpipe_ctx *ctx,
struct nlattr *nl) struct nlattr *nl)
{ {
struct nlattr *nla_action_value[DEVLINK_ATTR_MAX + 1] = {}; struct nlattr *nla_action_value[DEVLINK_ATTR_MAX + 1] = {};
struct dpipe_action action;
int err; int err;
err = mnl_attr_parse_nested(nl, attr_cb, nla_action_value); err = mnl_attr_parse_nested(nl, attr_cb, nla_action_value);
@ -3424,16 +3455,18 @@ static int dpipe_entry_action_value_show(struct dpipe_ctx *ctx,
} }
pr_out_entry_start(ctx->dl); pr_out_entry_start(ctx->dl);
if (dpipe_action_show(ctx, nla_action_value[DEVLINK_ATTR_DPIPE_ACTION])) if (dpipe_action_parse(&action,
goto err_action_show; nla_action_value[DEVLINK_ATTR_DPIPE_ACTION]))
goto err_action_parse;
pr_out_dpipe_action(&action, ctx);
if (dpipe_entry_value_show(ctx, nla_action_value)) if (dpipe_entry_value_show(ctx, nla_action_value))
goto err_value_show; goto err_value_show;
pr_out_entry_end(ctx->dl); pr_out_entry_end(ctx->dl);
return 0; return 0;
err_action_show:
err_value_show: err_value_show:
err_action_parse:
pr_out_entry_end(ctx->dl); pr_out_entry_end(ctx->dl);
return -EINVAL; return -EINVAL;
} }