Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d66e67b6 authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Greg Kroah-Hartman
Browse files

IB/mlx5: Fix steering rule of drop and count 



[ Upstream commit ed9085fed9d95d5921582e3c8474f3736c5d2782 ]

There are two flow rule destinations: QP and packet. While users are
setting DROP packet rule, the QP should not be set as a destination.

Fixes: 3b3233fb ("IB/mlx5: Add flow counters binding support")
Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Reviewed-by: default avatarRaed Salem <raeds@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Link: https://lore.kernel.org/r/20191212091214.315005-4-leon@kernel.org


Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d93412f2

drivers/infiniband/hw/mlx5/main.c

+6 −7
Original line number Diff line number Diff line
@@ -3286,10 +3286,6 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, 
	}



	INIT_LIST_HEAD(&handler->list);

	if (dst) {

		memcpy(&dest_arr[0], dst, sizeof(*dst));

		dest_num++;

	}



	for (spec_index = 0; spec_index < flow_attr->num_of_specs; spec_index++) {

		err = parse_flow_attr(dev->mdev, spec->match_criteria,
@@ -3303,6 +3299,11 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, 
		ib_flow += ((union ib_flow_spec *)ib_flow)->size;

	}



	if (dst && !(flow_act.action & MLX5_FLOW_CONTEXT_ACTION_DROP)) {

		memcpy(&dest_arr[0], dst, sizeof(*dst));

		dest_num++;

	}



	if (!flow_is_multicast_only(flow_attr))

		set_underlay_qp(dev, spec, underlay_qpn);
@@ -3340,10 +3341,8 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, 
	}



	if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_DROP) {

		if (!(flow_act.action & MLX5_FLOW_CONTEXT_ACTION_COUNT)) {

		if (!dest_num)

			rule_dst = NULL;

			dest_num = 0;

		}

	} else {

		if (is_egress)

			flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_ALLOW;