Commit 6cec0229 authored by Maor Dickman's avatar Maor Dickman Committed by Saeed Mahameed
Browse files

net/mlx5e: Enable adding peer miss rules only if merged eswitch is supported 



The cited commit creates peer miss group during switchdev mode
initialization in order to handle miss packets correctly while in VF
LAG mode. This is done regardless of FW support of such groups which
could cause rules setups failure later on.

Fix by adding FW capability check before creating peer groups/rule.

Fixes: ac004b83 ("net/mlx5e: E-Switch, Add peer miss rules")
Signed-off-by: default avatarMaor Dickman <maord@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Reviewed-by: default avatarRaed Salem <raeds@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 4c8594ad

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

+28 −24
Original line number Diff line number Diff line
@@ -1219,6 +1219,7 @@ static int esw_create_offloads_fdb_tables(struct mlx5_eswitch *esw) 
	}

	esw->fdb_table.offloads.send_to_vport_grp = g;



	if (MLX5_CAP_ESW(esw->dev, merged_eswitch)) {

		/* create peer esw miss group */

		memset(flow_group_in, 0, inlen);
@@ -1248,6 +1249,7 @@ static int esw_create_offloads_fdb_tables(struct mlx5_eswitch *esw) 
			goto peer_miss_err;

		}

		esw->fdb_table.offloads.peer_miss_grp = g;

	}



	/* create miss group */

	memset(flow_group_in, 0, inlen);
@@ -1281,6 +1283,7 @@ static int esw_create_offloads_fdb_tables(struct mlx5_eswitch *esw) 
miss_rule_err:

	mlx5_destroy_flow_group(esw->fdb_table.offloads.miss_grp);

miss_err:

	if (MLX5_CAP_ESW(esw->dev, merged_eswitch))

		mlx5_destroy_flow_group(esw->fdb_table.offloads.peer_miss_grp);

peer_miss_err:

	mlx5_destroy_flow_group(esw->fdb_table.offloads.send_to_vport_grp);
@@ -1305,6 +1308,7 @@ static void esw_destroy_offloads_fdb_tables(struct mlx5_eswitch *esw) 
	mlx5_del_flow_rules(esw->fdb_table.offloads.miss_rule_multi);

	mlx5_del_flow_rules(esw->fdb_table.offloads.miss_rule_uni);

	mlx5_destroy_flow_group(esw->fdb_table.offloads.send_to_vport_grp);

	if (MLX5_CAP_ESW(esw->dev, merged_eswitch))

		mlx5_destroy_flow_group(esw->fdb_table.offloads.peer_miss_grp);

	mlx5_destroy_flow_group(esw->fdb_table.offloads.miss_grp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE