Commit a586775f authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Fix double allocation of acl flow counter 



Flow counter is allocated in eswitch legacy acl setting functions
without checking if already allocated by previous setting. Add a check
to avoid such double allocation.

Fixes: 07bab950 ("net/mlx5: E-Switch, Refactor eswitch ingress acl codes")
Fixes: ea651a86 ("net/mlx5: E-Switch, Refactor eswitch egress acl codes")
Signed-off-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 7dbc849b

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_lgcy.c

+8 −4
Original line number Diff line number Diff line
@@ -79,12 +79,16 @@ int esw_acl_egress_lgcy_setup(struct mlx5_eswitch *esw, 
	int dest_num = 0;

	int err = 0;



	if (MLX5_CAP_ESW_EGRESS_ACL(esw->dev, flow_counter)) {

	if (vport->egress.legacy.drop_counter) {

		drop_counter = vport->egress.legacy.drop_counter;

	} else if (MLX5_CAP_ESW_EGRESS_ACL(esw->dev, flow_counter)) {

		drop_counter = mlx5_fc_create(esw->dev, false);

		if (IS_ERR(drop_counter))

		if (IS_ERR(drop_counter)) {

			esw_warn(esw->dev,

				 "vport[%d] configure egress drop rule counter err(%ld)\n",

				 vport->vport, PTR_ERR(drop_counter));

			drop_counter = NULL;

		}

		vport->egress.legacy.drop_counter = drop_counter;

	}
@@ -123,7 +127,7 @@ int esw_acl_egress_lgcy_setup(struct mlx5_eswitch *esw, 
	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_DROP;



	/* Attach egress drop flow counter */

	if (!IS_ERR_OR_NULL(drop_counter)) {

	if (drop_counter) {

		flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_COUNT;

		drop_ctr_dst.type = MLX5_FLOW_DESTINATION_TYPE_COUNTER;

		drop_ctr_dst.counter_id = mlx5_fc_id(drop_counter);
@@ -162,7 +166,7 @@ void esw_acl_egress_lgcy_cleanup(struct mlx5_eswitch *esw, 
	esw_acl_egress_table_destroy(vport);



clean_drop_counter:

	if (!IS_ERR_OR_NULL(vport->egress.legacy.drop_counter)) {

	if (vport->egress.legacy.drop_counter) {

		mlx5_fc_destroy(esw->dev, vport->egress.legacy.drop_counter);

		vport->egress.legacy.drop_counter = NULL;

	}

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c

+3 −1
Original line number Diff line number Diff line
@@ -160,7 +160,9 @@ int esw_acl_ingress_lgcy_setup(struct mlx5_eswitch *esw, 


	esw_acl_ingress_lgcy_rules_destroy(vport);



	if (MLX5_CAP_ESW_INGRESS_ACL(esw->dev, flow_counter)) {

	if (vport->ingress.legacy.drop_counter) {

		counter = vport->ingress.legacy.drop_counter;

	} else if (MLX5_CAP_ESW_INGRESS_ACL(esw->dev, flow_counter)) {

		counter = mlx5_fc_create(esw->dev, false);

		if (IS_ERR(counter)) {

			esw_warn(esw->dev,