From: Maor Gottlieb <maorg@mellanox.com>

Date: Thu, 12 Dec 2019 11:12:14 +0200

Subject: IB/mlx5: Fix steering rule of drop and count

Patch-mainline: v5.5-rc2

Git-commit: ed9085fed9d95d5921582e3c8474f3736c5d2782

References: bsc#1103991 FATE#326007

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: 3b3233fbf02e ("IB/mlx5: Add flow counters binding support")

Signed-off-by: Maor Gottlieb <maorg@mellanox.com>

Reviewed-by: Raed Salem <raeds@mellanox.com>

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>

Link: https://lore.kernel.org/r/20191212091214.315005-4-leon@kernel.org

Signed-off-by: Doug Ledford <dledford@redhat.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/infiniband/hw/mlx5/main.c |   13 ++++++-------

 1 file changed, 6 insertions(+), 7 deletions(-)

--- a/drivers/infiniband/hw/mlx5/main.c

+++ b/drivers/infiniband/hw/mlx5/main.c

@@ -3257,10 +3257,6 @@ static struct mlx5_ib_flow_handler *_cre

 	}

 	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,

@@ -3274,6 +3270,11 @@ static struct mlx5_ib_flow_handler *_cre

 		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);

@@ -3314,10 +3315,8 @@ static struct mlx5_ib_flow_handler *_cre

 	}

 	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;