Commit a962d7a6 authored by Parav Pandit's avatar Parav Pandit Committed by Saeed Mahameed
Browse files

net/mlx5: Restrict metadata disablement to offloads mode 



Now that there is clear separation for acl setup/cleanup between legacy
and offloads mode, limit metdata disablement to offloads mode.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarVu Pham <vuhuong@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 748da30b

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

+0 −2
Original line number Diff line number Diff line
@@ -1214,8 +1214,6 @@ void esw_vport_cleanup_ingress_rules(struct mlx5_eswitch *esw, 
		mlx5_del_flow_rules(vport->ingress.allow_rule);

		vport->ingress.allow_rule = NULL;

	}



	esw_vport_del_ingress_acl_modify_metadata(esw, vport);

}



void esw_vport_disable_ingress_acl(struct mlx5_eswitch *esw,

drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

+0 −2
Original line number Diff line number Diff line
@@ -267,8 +267,6 @@ void esw_vport_disable_egress_acl(struct mlx5_eswitch *esw, 
				  struct mlx5_vport *vport);

void esw_vport_disable_ingress_acl(struct mlx5_eswitch *esw,

				   struct mlx5_vport *vport);

void esw_vport_del_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,

					       struct mlx5_vport *vport);

int mlx5_esw_modify_vport_rate(struct mlx5_eswitch *esw, u16 vport_num,

			       u32 rate_mbps);

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

+6 −3
Original line number Diff line number Diff line
@@ -1847,7 +1847,7 @@ out: 
	return err;

}



void esw_vport_del_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,

static void esw_vport_del_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,

						      struct mlx5_vport *vport)

{

	if (vport->ingress.offloads.modify_metadata_rule) {
@@ -1962,9 +1962,11 @@ esw_vport_create_offloads_acl_tables(struct mlx5_eswitch *esw, 


	if (mlx5_eswitch_is_vf_vport(esw, vport->vport)) {

		err = esw_vport_egress_config(esw, vport);

		if (err)

		if (err) {

			esw_vport_del_ingress_acl_modify_metadata(esw, vport);

			esw_vport_disable_ingress_acl(esw, vport);

		}

	}

	return err;

}
@@ -1973,6 +1975,7 @@ esw_vport_destroy_offloads_acl_tables(struct mlx5_eswitch *esw, 
				      struct mlx5_vport *vport)

{

	esw_vport_disable_egress_acl(esw, vport);

	esw_vport_del_ingress_acl_modify_metadata(esw, vport);

	esw_vport_disable_ingress_acl(esw, vport);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE