AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

net/mlx5: Move metdata fields under offloads structure

Browse Source 
Metadata fields are offload mode specific.
To improve code readability, move metadata under offloads structure.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Vu Pham <vuhuong@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
This commit is contained in:
Parav Pandit 2019-10-28 23:35:10 +00:00 committed by Saeed Mahameed
parent 99ecd64631
commit d68316b5a1
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
View File

@ -69,11 +69,13 @@ struct vport_ingress {
struct mlx5_flow_group *allow_spoofchk_only_grp; struct mlx5_flow_group *allow_spoofchk_only_grp;
struct mlx5_flow_group *allow_untagged_only_grp; struct mlx5_flow_group *allow_untagged_only_grp;
struct mlx5_flow_group *drop_grp; struct mlx5_flow_group *drop_grp;
struct mlx5_modify_hdr *modify_metadata;
struct mlx5_flow_handle *modify_metadata_rule;
struct mlx5_flow_handle *allow_rule; struct mlx5_flow_handle *allow_rule;
struct mlx5_flow_handle *drop_rule; struct mlx5_flow_handle *drop_rule;
struct mlx5_fc *drop_counter; struct mlx5_fc *drop_counter;
struct {
struct mlx5_modify_hdr *modify_metadata;
struct mlx5_flow_handle *modify_metadata_rule;
} offloads;
}; };
struct vport_egress { struct vport_egress {

33
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
View File

@ -1778,9 +1778,9 @@ static int esw_vport_ingress_prio_tag_config(struct mlx5_eswitch *esw,
flow_act.vlan[0].vid = 0; flow_act.vlan[0].vid = 0;
flow_act.vlan[0].prio = 0; flow_act.vlan[0].prio = 0;
if (vport->ingress.modify_metadata_rule) { if (vport->ingress.offloads.modify_metadata_rule) {
flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR; flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;
flow_act.modify_hdr = vport->ingress.modify_metadata; flow_act.modify_hdr = vport->ingress.offloads.modify_metadata;
} }
vport->ingress.allow_rule = vport->ingress.allow_rule =
@ -1816,11 +1816,11 @@ static int esw_vport_add_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,
MLX5_SET(set_action_in, action, data, MLX5_SET(set_action_in, action, data,
mlx5_eswitch_get_vport_metadata_for_match(esw, vport->vport)); mlx5_eswitch_get_vport_metadata_for_match(esw, vport->vport));
vport->ingress.modify_metadata = vport->ingress.offloads.modify_metadata =
mlx5_modify_header_alloc(esw->dev, MLX5_FLOW_NAMESPACE_ESW_INGRESS, mlx5_modify_header_alloc(esw->dev, MLX5_FLOW_NAMESPACE_ESW_INGRESS,
1, action); 1, action);
if (IS_ERR(vport->ingress.modify_metadata)) { if (IS_ERR(vport->ingress.offloads.modify_metadata)) {
err = PTR_ERR(vport->ingress.modify_metadata); err = PTR_ERR(vport->ingress.offloads.modify_metadata);
esw_warn(esw->dev, esw_warn(esw->dev,
"failed to alloc modify header for vport %d ingress acl (%d)\n", "failed to alloc modify header for vport %d ingress acl (%d)\n",
vport->vport, err); vport->vport, err);
@ -1828,32 +1828,33 @@ static int esw_vport_add_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,
} }
flow_act.action = MLX5_FLOW_CONTEXT_ACTION_MOD_HDR | MLX5_FLOW_CONTEXT_ACTION_ALLOW; flow_act.action = MLX5_FLOW_CONTEXT_ACTION_MOD_HDR | MLX5_FLOW_CONTEXT_ACTION_ALLOW;
flow_act.modify_hdr = vport->ingress.modify_metadata; flow_act.modify_hdr = vport->ingress.offloads.modify_metadata;
vport->ingress.modify_metadata_rule = mlx5_add_flow_rules(vport->ingress.acl, vport->ingress.offloads.modify_metadata_rule =
&spec, &flow_act, NULL, 0); mlx5_add_flow_rules(vport->ingress.acl,
if (IS_ERR(vport->ingress.modify_metadata_rule)) { &spec, &flow_act, NULL, 0);
err = PTR_ERR(vport->ingress.modify_metadata_rule); if (IS_ERR(vport->ingress.offloads.modify_metadata_rule)) {
err = PTR_ERR(vport->ingress.offloads.modify_metadata_rule);
esw_warn(esw->dev, esw_warn(esw->dev,
"failed to add setting metadata rule for vport %d ingress acl, err(%d)\n", "failed to add setting metadata rule for vport %d ingress acl, err(%d)\n",
vport->vport, err); vport->vport, err);
vport->ingress.modify_metadata_rule = NULL; vport->ingress.offloads.modify_metadata_rule = NULL;
goto out; goto out;
} }
out: out:
if (err) if (err)
mlx5_modify_header_dealloc(esw->dev, vport->ingress.modify_metadata); mlx5_modify_header_dealloc(esw->dev, vport->ingress.offloads.modify_metadata);
return err; return err;
} }
void esw_vport_del_ingress_acl_modify_metadata(struct mlx5_eswitch *esw, void esw_vport_del_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,
struct mlx5_vport *vport) struct mlx5_vport *vport)
{ {
if (vport->ingress.modify_metadata_rule) { if (vport->ingress.offloads.modify_metadata_rule) {
mlx5_del_flow_rules(vport->ingress.modify_metadata_rule); mlx5_del_flow_rules(vport->ingress.offloads.modify_metadata_rule);
mlx5_modify_header_dealloc(esw->dev, vport->ingress.modify_metadata); mlx5_modify_header_dealloc(esw->dev, vport->ingress.offloads.modify_metadata);
vport->ingress.modify_metadata_rule = NULL; vport->ingress.offloads.modify_metadata_rule = NULL;
} }
} }