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

Commit d9f88e5a authored by Yishai Hadas's avatar Yishai Hadas Committed by Doug Ledford
Browse files

IB/mlx5: Use TIR number based on selector 



Use TIR number based on selector, it should be done to differentiate
between RSS QP to RAW one.

Reported-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Tested-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent b2a232d2

drivers/infiniband/hw/mlx5/main.c

+5 −1
Original line number Diff line number Diff line
@@ -1849,6 +1849,7 @@ static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp, 
					   int domain)

{

	struct mlx5_ib_dev *dev = to_mdev(qp->device);

	struct mlx5_ib_qp *mqp = to_mqp(qp);

	struct mlx5_ib_flow_handler *handler = NULL;

	struct mlx5_flow_destination *dst = NULL;

	struct mlx5_ib_flow_prio *ft_prio;
@@ -1875,7 +1876,10 @@ static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp, 
	}



	dst->type = MLX5_FLOW_DESTINATION_TYPE_TIR;

	dst->tir_num = to_mqp(qp)->raw_packet_qp.rq.tirn;

	if (mqp->flags & MLX5_IB_QP_RSS)

		dst->tir_num = mqp->rss_qp.tirn;

	else

		dst->tir_num = mqp->raw_packet_qp.rq.tirn;



	if (flow_attr->type == IB_FLOW_ATTR_NORMAL) {

		if (flow_attr->flags & IB_FLOW_ATTR_FLAGS_DONT_TRAP)  {

drivers/infiniband/hw/mlx5/mlx5_ib.h

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ enum mlx5_ib_qp_flags { 
	/* QP uses 1 as its source QP number */

	MLX5_IB_QP_SQPN_QP1			= 1 << 6,

	MLX5_IB_QP_CAP_SCATTER_FCS		= 1 << 7,

	MLX5_IB_QP_RSS				= 1 << 8,

};



struct mlx5_umr_wr {

drivers/infiniband/hw/mlx5/qp.c

+1 −0
Original line number Diff line number Diff line
@@ -1449,6 +1449,7 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 
	kvfree(in);

	/* qpn is reserved for that QP */

	qp->trans_qp.base.mqp.qpn = 0;

	qp->flags |= MLX5_IB_QP_RSS;

	return 0;



err: