Skip to content

L
linux
Commit 09bf9792 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files
Options

net/mlx5e: TC, Move pedit_headers_action to parse_attr 

Move pedit_headers_action from flow parse_state to flow parse_attr.
In a follow up commit we are going to have multiple attr per flow
and pedit_headers_action are unique per attr.
Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarOz Shlomo <ozsh@nvidia.com>
Reviewed-by: default avatarMaor Dickman <maord@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent df67ad62
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 34 deletions
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
View file @ 09bf9792
...@@ -21,7 +21,6 @@ struct mlx5e_tc_act_parse_state { ...@@ -21,7 +21,6 @@ struct mlx5e_tc_act_parse_state {
bool mpls_push; bool mpls_push;
bool ptype_host; bool ptype_host;
const struct ip_tunnel_info *tun_info; const struct ip_tunnel_info *tun_info;
struct pedit_headers_action hdrs[__PEDIT_CMD_MAX];
int ifindexes[MLX5_MAX_FLOW_FWD_VPORTS]; int ifindexes[MLX5_MAX_FLOW_FWD_VPORTS];
int if_count; int if_count;
struct mlx5_tc_ct_priv *ct_priv; struct mlx5_tc_ct_priv *ct_priv;
......
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.c
View file @ 09bf9792
...@@ -46,9 +46,9 @@ static int ...@@ -46,9 +46,9 @@ static int
parse_pedit_to_modify_hdr(struct mlx5e_priv *priv, parse_pedit_to_modify_hdr(struct mlx5e_priv *priv,
const struct flow_action_entry *act, int namespace, const struct flow_action_entry *act, int namespace,
struct mlx5e_tc_flow_parse_attr *parse_attr, struct mlx5e_tc_flow_parse_attr *parse_attr,
struct pedit_headers_action *hdrs,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct pedit_headers_action *hdrs = parse_attr->hdrs;
u8 cmd = (act->id == FLOW_ACTION_MANGLE) ? 0 : 1; u8 cmd = (act->id == FLOW_ACTION_MANGLE) ? 0 : 1;
u8 htype = act->mangle.htype; u8 htype = act->mangle.htype;
int err = -EOPNOTSUPP; int err = -EOPNOTSUPP;
...@@ -110,14 +110,13 @@ int ...@@ -110,14 +110,13 @@ int
mlx5e_tc_act_pedit_parse_action(struct mlx5e_priv *priv, mlx5e_tc_act_pedit_parse_action(struct mlx5e_priv *priv,
const struct flow_action_entry *act, int namespace, const struct flow_action_entry *act, int namespace,
struct mlx5e_tc_flow_parse_attr *parse_attr, struct mlx5e_tc_flow_parse_attr *parse_attr,
struct pedit_headers_action *hdrs,
struct mlx5e_tc_flow *flow, struct mlx5e_tc_flow *flow,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
if (flow && flow_flag_test(flow, L3_TO_L2_DECAP)) if (flow && flow_flag_test(flow, L3_TO_L2_DECAP))
return parse_pedit_to_reformat(act, parse_attr, extack); return parse_pedit_to_reformat(act, parse_attr, extack);
return parse_pedit_to_modify_hdr(priv, act, namespace, parse_attr, hdrs, extack); return parse_pedit_to_modify_hdr(priv, act, namespace, parse_attr, extack);
} }
static bool static bool
...@@ -141,8 +140,7 @@ tc_act_parse_pedit(struct mlx5e_tc_act_parse_state *parse_state, ...@@ -141,8 +140,7 @@ tc_act_parse_pedit(struct mlx5e_tc_act_parse_state *parse_state,
ns_type = mlx5e_get_flow_namespace(flow); ns_type = mlx5e_get_flow_namespace(flow);
err = mlx5e_tc_act_pedit_parse_action(flow->priv, act, ns_type, err = mlx5e_tc_act_pedit_parse_action(flow->priv, act, ns_type, attr->parse_attr,
attr->parse_attr, parse_state->hdrs,
flow, parse_state->extack); flow, parse_state->extack);
if (err) if (err)
return err; return err;
......
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.h
View file @ 09bf9792
...@@ -25,7 +25,6 @@ int ...@@ -25,7 +25,6 @@ int
mlx5e_tc_act_pedit_parse_action(struct mlx5e_priv *priv, mlx5e_tc_act_pedit_parse_action(struct mlx5e_priv *priv,
const struct flow_action_entry *act, int namespace, const struct flow_action_entry *act, int namespace,
struct mlx5e_tc_flow_parse_attr *parse_attr, struct mlx5e_tc_flow_parse_attr *parse_attr,
struct pedit_headers_action *hdrs,
struct mlx5e_tc_flow *flow, struct mlx5e_tc_flow *flow,
struct netlink_ext_ack *extack); struct netlink_ext_ack *extack);
......
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.c
View file @ 09bf9792
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
static int static int
add_vlan_prio_tag_rewrite_action(struct mlx5e_priv *priv, add_vlan_prio_tag_rewrite_action(struct mlx5e_priv *priv,
struct mlx5e_tc_flow_parse_attr *parse_attr, struct mlx5e_tc_flow_parse_attr *parse_attr,
struct pedit_headers_action *hdrs,
u32 *action, struct netlink_ext_ack *extack) u32 *action, struct netlink_ext_ack *extack)
{ {
const struct flow_action_entry prio_tag_act = { const struct flow_action_entry prio_tag_act = {
...@@ -26,7 +25,7 @@ add_vlan_prio_tag_rewrite_action(struct mlx5e_priv *priv, ...@@ -26,7 +25,7 @@ add_vlan_prio_tag_rewrite_action(struct mlx5e_priv *priv,
}; };
return mlx5e_tc_act_vlan_add_rewrite_action(priv, MLX5_FLOW_NAMESPACE_FDB, return mlx5e_tc_act_vlan_add_rewrite_action(priv, MLX5_FLOW_NAMESPACE_FDB,
&prio_tag_act, parse_attr, hdrs, action, &prio_tag_act, parse_attr, action,
extack); extack);
} }
...@@ -170,8 +169,8 @@ tc_act_parse_vlan(struct mlx5e_tc_act_parse_state *parse_state, ...@@ -170,8 +169,8 @@ tc_act_parse_vlan(struct mlx5e_tc_act_parse_state *parse_state,
/* Replace vlan pop+push with vlan modify */ /* Replace vlan pop+push with vlan modify */
attr->action &= ~MLX5_FLOW_CONTEXT_ACTION_VLAN_POP; attr->action &= ~MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;
err = mlx5e_tc_act_vlan_add_rewrite_action(priv, MLX5_FLOW_NAMESPACE_FDB, act, err = mlx5e_tc_act_vlan_add_rewrite_action(priv, MLX5_FLOW_NAMESPACE_FDB, act,
attr->parse_attr, parse_state->hdrs, attr->parse_attr, &attr->action,
&attr->action, parse_state->extack); parse_state->extack);
} else { } else {
err = parse_tc_vlan_action(priv, act, esw_attr, &attr->action, err = parse_tc_vlan_action(priv, act, esw_attr, &attr->action,
parse_state->extack); parse_state->extack);
...@@ -191,7 +190,6 @@ tc_act_post_parse_vlan(struct mlx5e_tc_act_parse_state *parse_state, ...@@ -191,7 +190,6 @@ tc_act_post_parse_vlan(struct mlx5e_tc_act_parse_state *parse_state,
struct mlx5_flow_attr *attr) struct mlx5_flow_attr *attr)
{ {
struct mlx5e_tc_flow_parse_attr *parse_attr = attr->parse_attr; struct mlx5e_tc_flow_parse_attr *parse_attr = attr->parse_attr;
struct pedit_headers_action *hdrs = parse_state->hdrs;
struct netlink_ext_ack *extack = parse_state->extack; struct netlink_ext_ack *extack = parse_state->extack;
struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
int err; int err;
...@@ -202,7 +200,7 @@ tc_act_post_parse_vlan(struct mlx5e_tc_act_parse_state *parse_state, ...@@ -202,7 +200,7 @@ tc_act_post_parse_vlan(struct mlx5e_tc_act_parse_state *parse_state,
* tag rewrite. * tag rewrite.
*/ */
attr->action &= ~MLX5_FLOW_CONTEXT_ACTION_VLAN_POP; attr->action &= ~MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;
err = add_vlan_prio_tag_rewrite_action(priv, parse_attr, hdrs, err = add_vlan_prio_tag_rewrite_action(priv, parse_attr,
&attr->action, extack); &attr->action, extack);
if (err) if (err)
return err; return err;
......
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.h
View file @ 09bf9792
...@@ -24,7 +24,6 @@ int ...@@ -24,7 +24,6 @@ int
mlx5e_tc_act_vlan_add_rewrite_action(struct mlx5e_priv *priv, int namespace, mlx5e_tc_act_vlan_add_rewrite_action(struct mlx5e_priv *priv, int namespace,
const struct flow_action_entry *act, const struct flow_action_entry *act,
struct mlx5e_tc_flow_parse_attr *parse_attr, struct mlx5e_tc_flow_parse_attr *parse_attr,
struct pedit_headers_action *hdrs,
u32 *action, struct netlink_ext_ack *extack); u32 *action, struct netlink_ext_ack *extack);
#endif /* __MLX5_EN_TC_ACT_VLAN_H__ */ #endif /* __MLX5_EN_TC_ACT_VLAN_H__ */
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan_mangle.c
View file @ 09bf9792
...@@ -12,7 +12,6 @@ int ...@@ -12,7 +12,6 @@ int
mlx5e_tc_act_vlan_add_rewrite_action(struct mlx5e_priv *priv, int namespace, mlx5e_tc_act_vlan_add_rewrite_action(struct mlx5e_priv *priv, int namespace,
const struct flow_action_entry *act, const struct flow_action_entry *act,
struct mlx5e_tc_flow_parse_attr *parse_attr, struct mlx5e_tc_flow_parse_attr *parse_attr,
struct pedit_headers_action *hdrs,
u32 *action, struct netlink_ext_ack *extack) u32 *action, struct netlink_ext_ack *extack)
{ {
u16 mask16 = VLAN_VID_MASK; u16 mask16 = VLAN_VID_MASK;
...@@ -44,7 +43,7 @@ mlx5e_tc_act_vlan_add_rewrite_action(struct mlx5e_priv *priv, int namespace, ...@@ -44,7 +43,7 @@ mlx5e_tc_act_vlan_add_rewrite_action(struct mlx5e_priv *priv, int namespace,
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
err = mlx5e_tc_act_pedit_parse_action(priv, &pedit_act, namespace, parse_attr, hdrs, err = mlx5e_tc_act_pedit_parse_action(priv, &pedit_act, namespace, parse_attr,
NULL, extack); NULL, extack);
*action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR; *action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;
...@@ -69,8 +68,7 @@ tc_act_parse_vlan_mangle(struct mlx5e_tc_act_parse_state *parse_state, ...@@ -69,8 +68,7 @@ tc_act_parse_vlan_mangle(struct mlx5e_tc_act_parse_state *parse_state,
int err; int err;
ns_type = mlx5e_get_flow_namespace(parse_state->flow); ns_type = mlx5e_get_flow_namespace(parse_state->flow);
err = mlx5e_tc_act_vlan_add_rewrite_action(priv, ns_type, act, err = mlx5e_tc_act_vlan_add_rewrite_action(priv, ns_type, act, attr->parse_attr,
attr->parse_attr, parse_state->hdrs,
&attr->action, parse_state->extack); &attr->action, parse_state->extack);
if (err) if (err)
return err; return err;
......
drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
View file @ 09bf9792
...@@ -37,6 +37,7 @@ struct mlx5e_tc_flow_parse_attr { ...@@ -37,6 +37,7 @@ struct mlx5e_tc_flow_parse_attr {
const struct ip_tunnel_info *tun_info[MLX5_MAX_FLOW_FWD_VPORTS]; const struct ip_tunnel_info *tun_info[MLX5_MAX_FLOW_FWD_VPORTS];
struct net_device *filter_dev; struct net_device *filter_dev;
struct mlx5_flow_spec spec; struct mlx5_flow_spec spec;
struct pedit_headers_action hdrs[__PEDIT_CMD_MAX];
struct mlx5e_tc_mod_hdr_acts mod_hdr_acts; struct mlx5e_tc_mod_hdr_acts mod_hdr_acts;
int mirred_ifindex[MLX5_MAX_FLOW_FWD_VPORTS]; int mirred_ifindex[MLX5_MAX_FLOW_FWD_VPORTS];
struct ethhdr eth; struct ethhdr eth;
......
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
View file @ 09bf9792
...@@ -2859,14 +2859,15 @@ static unsigned long mask_to_le(unsigned long mask, int size) ...@@ -2859,14 +2859,15 @@ static unsigned long mask_to_le(unsigned long mask, int size)
return mask; return mask;
} }
static int offload_pedit_fields(struct mlx5e_priv *priv, static int offload_pedit_fields(struct mlx5e_priv *priv,
int namespace, int namespace,
struct pedit_headers_action *hdrs,
struct mlx5e_tc_flow_parse_attr *parse_attr, struct mlx5e_tc_flow_parse_attr *parse_attr,
u32 *action_flags, u32 *action_flags,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct pedit_headers *set_masks, *add_masks, *set_vals, *add_vals; struct pedit_headers *set_masks, *add_masks, *set_vals, *add_vals;
struct pedit_headers_action *hdrs = parse_attr->hdrs;
void *headers_c, *headers_v, *action, *vals_p; void *headers_c, *headers_v, *action, *vals_p;
u32 *s_masks_p, *a_masks_p, s_mask, a_mask; u32 *s_masks_p, *a_masks_p, s_mask, a_mask;
struct mlx5e_tc_mod_hdr_acts *mod_acts; struct mlx5e_tc_mod_hdr_acts *mod_acts;
...@@ -2994,7 +2995,6 @@ static const struct pedit_headers zero_masks = {}; ...@@ -2994,7 +2995,6 @@ static const struct pedit_headers zero_masks = {};
static int alloc_tc_pedit_action(struct mlx5e_priv *priv, int namespace, static int alloc_tc_pedit_action(struct mlx5e_priv *priv, int namespace,
struct mlx5e_tc_flow_parse_attr *parse_attr, struct mlx5e_tc_flow_parse_attr *parse_attr,
struct pedit_headers_action *hdrs,
u32 *action_flags, u32 *action_flags,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
...@@ -3002,16 +3002,14 @@ static int alloc_tc_pedit_action(struct mlx5e_priv *priv, int namespace, ...@@ -3002,16 +3002,14 @@ static int alloc_tc_pedit_action(struct mlx5e_priv *priv, int namespace,
int err; int err;
u8 cmd; u8 cmd;
err = offload_pedit_fields(priv, namespace, hdrs, parse_attr, err = offload_pedit_fields(priv, namespace, parse_attr, action_flags, extack);
action_flags, extack);
if (err < 0) if (err < 0)
goto out_dealloc_parsed_actions; goto out_dealloc_parsed_actions;
for (cmd = 0; cmd < __PEDIT_CMD_MAX; cmd++) { for (cmd = 0; cmd < __PEDIT_CMD_MAX; cmd++) {
cmd_masks = &hdrs[cmd].masks; cmd_masks = &parse_attr->hdrs[cmd].masks;
if (memcmp(cmd_masks, &zero_masks, sizeof(zero_masks))) { if (memcmp(cmd_masks, &zero_masks, sizeof(zero_masks))) {
NL_SET_ERR_MSG_MOD(extack, NL_SET_ERR_MSG_MOD(extack, "attempt to offload an unsupported field");
"attempt to offload an unsupported field");
netdev_warn(priv->netdev, "attempt to offload an unsupported field (cmd %d)\n", cmd); netdev_warn(priv->netdev, "attempt to offload an unsupported field (cmd %d)\n", cmd);
print_hex_dump(KERN_WARNING, "mask: ", DUMP_PREFIX_ADDRESS, print_hex_dump(KERN_WARNING, "mask: ", DUMP_PREFIX_ADDRESS,
16, 1, cmd_masks, sizeof(zero_masks), true); 16, 1, cmd_masks, sizeof(zero_masks), true);
...@@ -3319,10 +3317,10 @@ static int ...@@ -3319,10 +3317,10 @@ static int
actions_prepare_mod_hdr_actions(struct mlx5e_priv *priv, actions_prepare_mod_hdr_actions(struct mlx5e_priv *priv,
struct mlx5e_tc_flow *flow, struct mlx5e_tc_flow *flow,
struct mlx5_flow_attr *attr, struct mlx5_flow_attr *attr,
struct pedit_headers_action *hdrs,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct mlx5e_tc_flow_parse_attr *parse_attr = attr->parse_attr; struct mlx5e_tc_flow_parse_attr *parse_attr = attr->parse_attr;
struct pedit_headers_action *hdrs = parse_attr->hdrs;
enum mlx5_flow_namespace_type ns_type; enum mlx5_flow_namespace_type ns_type;
int err; int err;
...@@ -3332,8 +3330,7 @@ actions_prepare_mod_hdr_actions(struct mlx5e_priv *priv, ...@@ -3332,8 +3330,7 @@ actions_prepare_mod_hdr_actions(struct mlx5e_priv *priv,
ns_type = mlx5e_get_flow_namespace(flow); ns_type = mlx5e_get_flow_namespace(flow);
err = alloc_tc_pedit_action(priv, ns_type, parse_attr, hdrs, err = alloc_tc_pedit_action(priv, ns_type, parse_attr, &attr->action, extack);
&attr->action, extack);
if (err) if (err)
return err; return err;
...@@ -3381,7 +3378,6 @@ parse_tc_nic_actions(struct mlx5e_priv *priv, ...@@ -3381,7 +3378,6 @@ parse_tc_nic_actions(struct mlx5e_priv *priv,
struct mlx5e_tc_act_parse_state *parse_state; struct mlx5e_tc_act_parse_state *parse_state;
struct mlx5e_tc_flow_parse_attr *parse_attr; struct mlx5e_tc_flow_parse_attr *parse_attr;
struct mlx5_flow_attr *attr = flow->attr; struct mlx5_flow_attr *attr = flow->attr;
struct pedit_headers_action *hdrs;
int err; int err;
err = flow_action_supported(flow_action, extack); err = flow_action_supported(flow_action, extack);
...@@ -3393,13 +3389,12 @@ parse_tc_nic_actions(struct mlx5e_priv *priv, ...@@ -3393,13 +3389,12 @@ parse_tc_nic_actions(struct mlx5e_priv *priv,
parse_state = &parse_attr->parse_state; parse_state = &parse_attr->parse_state;
mlx5e_tc_act_init_parse_state(parse_state, flow, flow_action, extack); mlx5e_tc_act_init_parse_state(parse_state, flow, flow_action, extack);
parse_state->ct_priv = get_ct_priv(priv); parse_state->ct_priv = get_ct_priv(priv);
hdrs = parse_state->hdrs;
err = parse_tc_actions(parse_state, flow_action); err = parse_tc_actions(parse_state, flow_action);
if (err) if (err)
return err; return err;
err = actions_prepare_mod_hdr_actions(priv, flow, attr, hdrs, extack); err = actions_prepare_mod_hdr_actions(priv, flow, attr, extack);
if (err) if (err)
return err; return err;
...@@ -3504,7 +3499,6 @@ parse_tc_fdb_actions(struct mlx5e_priv *priv, ...@@ -3504,7 +3499,6 @@ parse_tc_fdb_actions(struct mlx5e_priv *priv,
struct mlx5e_tc_flow_parse_attr *parse_attr; struct mlx5e_tc_flow_parse_attr *parse_attr;
struct mlx5_flow_attr *attr = flow->attr; struct mlx5_flow_attr *attr = flow->attr;
struct mlx5_esw_flow_attr *esw_attr; struct mlx5_esw_flow_attr *esw_attr;
struct pedit_headers_action *hdrs;
int err; int err;
err = flow_action_supported(flow_action, extack); err = flow_action_supported(flow_action, extack);
...@@ -3516,7 +3510,6 @@ parse_tc_fdb_actions(struct mlx5e_priv *priv, ...@@ -3516,7 +3510,6 @@ parse_tc_fdb_actions(struct mlx5e_priv *priv,
parse_state = &parse_attr->parse_state; parse_state = &parse_attr->parse_state;
mlx5e_tc_act_init_parse_state(parse_state, flow, flow_action, extack); mlx5e_tc_act_init_parse_state(parse_state, flow, flow_action, extack);
parse_state->ct_priv = get_ct_priv(priv); parse_state->ct_priv = get_ct_priv(priv);
hdrs = parse_state->hdrs;
err = parse_tc_actions(parse_state, flow_action); err = parse_tc_actions(parse_state, flow_action);
if (err) if (err)
...@@ -3530,7 +3523,7 @@ parse_tc_fdb_actions(struct mlx5e_priv *priv, ...@@ -3530,7 +3523,7 @@ parse_tc_fdb_actions(struct mlx5e_priv *priv,
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
err = actions_prepare_mod_hdr_actions(priv, flow, attr, hdrs, extack); err = actions_prepare_mod_hdr_actions(priv, flow, attr, extack);
if (err) if (err)
return err; return err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7