Commit dfb25edd authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'mlx5_ib_qp_refactor_1' into rdma.git for-next 

Leon Romanovsky says:

====================
This is first part of series which tries to return some sanity to
mlx5_ib_create_qp() function. Such refactoring is required to make
extension of that function with less worries of breaking driver.

Extra goal of such refactoring is to ensure that QP is allocated at the
beginning of function and released at the end. It will allow us to move QP
allocation to be under IB/core responsibility.
====================

Based on the mlx5-next branch at
 git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux


Due to dependencies

* branch 'mlx5_ib_qp_refactor_1': (66 commits)
  RDMA/mlx5: Process all vendor flags in one place
  RDMA/mlx5: Return all configured create flags through query QP
  RDMA/mlx5: Change scatter CQE flag to be set like other vendor flags
  RDMA/mlx5: Use flags_en mechanism to mark QP created with WQE signature
  RDMA/mlx5: Process create QP flags in one place
  RDMA/mlx5: Delete create QP flags obfuscation
  RDMA/mlx5: Initial separation of RAW_PACKET QP from common flow
  RDMA/mlx5: Remove second copy from user for non RSS RAW QPs
  RDMA/mlx5: Move DRIVER QP flags check into separate function
  RDMA/mlx5: Update all DRIVER QP places to use QP subtype
  RDMA/mlx5: Split scatter CQE configuration for DCT QP
  RDMA/mlx5: Separate create QP flows to be based on type
  RDMA/mlx5: Set QP subtype immediately when it is known
  RDMA/mlx5: Avoid setting redundant NULL for XRC QPs
  RDMA/mlx5: Prepare QP allocation for future removal
  RDMA/mlx5: Perform check if QP creation flow is valid
  RDMA/mlx5: Delete impossible GSI port check
  RDMA/mlx5: Organize QP types checks in one place

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parents a97bf49f 37518fa4

drivers/infiniband/hw/mlx5/Makefile

+21 −7
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_MLX5_INFINIBAND) += mlx5_ib.o



mlx5_ib-y :=	main.o cq.o doorbell.o qp.o mem.o srq_cmd.o \

		srq.o mr.o ah.o mad.o gsi.o ib_virt.o cmd.o \

		cong.o restrack.o

mlx5_ib-y := ah.o \

	     cmd.o \

	     cong.o \

	     cq.o \

	     doorbell.o \

	     gsi.o \

	     ib_virt.o \

	     mad.o \

	     main.o \

	     mem.o \

	     mr.o \

	     qp.o \

	     qpc.o \

	     restrack.o \

	     srq.o \

	     srq_cmd.o



mlx5_ib-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += odp.o

mlx5_ib-$(CONFIG_MLX5_ESWITCH) += ib_rep.o

mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += devx.o

mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += flow.o

mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += qos.o
 
mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += devx.o \

					    flow.o \

					    qos.o

drivers/infiniband/hw/mlx5/cmd.c

+0 −17
Original line number Diff line number Diff line
@@ -327,23 +327,6 @@ int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid) 
	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

}



int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id,

			     u16 uid)

{

	u32 in[MLX5_ST_SZ_DW(alloc_q_counter_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(alloc_q_counter_out)] = {0};

	int err;



	MLX5_SET(alloc_q_counter_in, in, opcode, MLX5_CMD_OP_ALLOC_Q_COUNTER);

	MLX5_SET(alloc_q_counter_in, in, uid, uid);



	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	if (!err)

		*counter_id = MLX5_GET(alloc_q_counter_out, out,

				       counter_set_id);

	return err;

}



int mlx5_cmd_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,

		     u16 opmod, u8 port)

{

drivers/infiniband/hw/mlx5/cmd.h

+0 −2
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ int mlx5_cmd_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, 
			u32 qpn, u16 uid);

int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid);

int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid);

int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id,

			     u16 uid);

int mlx5_cmd_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,

		     u16 opmod, u8 port);

#endif /* MLX5_IB_CMD_H */

drivers/infiniband/hw/mlx5/cq.c

+6 −5
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <rdma/ib_cache.h>

#include "mlx5_ib.h"

#include "srq.h"

#include "qp.h"



static void mlx5_ib_cq_comp(struct mlx5_core_cq *cq, struct mlx5_eqe *eqe)

{
@@ -201,7 +202,7 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe, 
	case MLX5_CQE_RESP_WR_IMM:

		wc->opcode	= IB_WC_RECV_RDMA_WITH_IMM;

		wc->wc_flags	= IB_WC_WITH_IMM;

		wc->ex.imm_data = cqe->imm_inval_pkey;

		wc->ex.imm_data = cqe->immediate;

		break;

	case MLX5_CQE_RESP_SEND:

		wc->opcode   = IB_WC_RECV;
@@ -213,12 +214,12 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe, 
	case MLX5_CQE_RESP_SEND_IMM:

		wc->opcode	= IB_WC_RECV;

		wc->wc_flags	= IB_WC_WITH_IMM;

		wc->ex.imm_data = cqe->imm_inval_pkey;

		wc->ex.imm_data = cqe->immediate;

		break;

	case MLX5_CQE_RESP_SEND_INV:

		wc->opcode	= IB_WC_RECV;

		wc->wc_flags	= IB_WC_WITH_INVALIDATE;

		wc->ex.invalidate_rkey = be32_to_cpu(cqe->imm_inval_pkey);

		wc->ex.invalidate_rkey = be32_to_cpu(cqe->inval_rkey);

		break;

	}

	wc->src_qp	   = be32_to_cpu(cqe->flags_rqpn) & 0xffffff;
@@ -226,7 +227,7 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe, 
	g = (be32_to_cpu(cqe->flags_rqpn) >> 28) & 3;

	wc->wc_flags |= g ? IB_WC_GRH : 0;

	if (unlikely(is_qp1(qp->ibqp.qp_type))) {

		u16 pkey = be32_to_cpu(cqe->imm_inval_pkey) & 0xffff;

		u16 pkey = be32_to_cpu(cqe->pkey) & 0xffff;



		ib_find_cached_pkey(&dev->ib_dev, qp->port, pkey,

				    &wc->pkey_index);
@@ -484,7 +485,7 @@ repoll: 
		 * because CQs will be locked while QPs are removed

		 * from the table.

		 */

		mqp = __mlx5_qp_lookup(dev->mdev, qpn);

		mqp = radix_tree_lookup(&dev->qp_table.tree, qpn);

		*cur_qp = to_mibqp(mqp);

	}

drivers/infiniband/hw/mlx5/devx.c

+6 −6
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/mlx5/driver.h>

#include <linux/mlx5/fs.h>

#include "mlx5_ib.h"

#include "qp.h"

#include <linux/xarray.h>



#define UVERBS_MODULE_NAME mlx5_ib
@@ -614,7 +615,7 @@ static bool devx_is_valid_obj_id(struct uverbs_attr_bundle *attrs, 
		enum ib_qp_type	qp_type = qp->ibqp.qp_type;



		if (qp_type == IB_QPT_RAW_PACKET ||

		    (qp->flags & MLX5_IB_QP_UNDERLAY)) {

		    (qp->flags & IB_QP_CREATE_SOURCE_QPN)) {

			struct mlx5_ib_raw_packet_qp *raw_packet_qp =

							 &qp->raw_packet_qp;

			struct mlx5_ib_rq *rq = &raw_packet_qp->rq;
@@ -1356,7 +1357,7 @@ static int devx_obj_cleanup(struct ib_uobject *uobject, 
	}



	if (obj->flags & DEVX_OBJ_FLAGS_DCT)

		ret = mlx5_core_destroy_dct(obj->ib_dev->mdev, &obj->core_dct);

		ret = mlx5_core_destroy_dct(obj->ib_dev, &obj->core_dct);

	else if (obj->flags & DEVX_OBJ_FLAGS_CQ)

		ret = mlx5_core_destroy_cq(obj->ib_dev->mdev, &obj->core_cq);

	else
@@ -1450,9 +1451,8 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)( 


	if (opcode == MLX5_CMD_OP_CREATE_DCT) {

		obj->flags |= DEVX_OBJ_FLAGS_DCT;

		err = mlx5_core_create_dct(dev->mdev, &obj->core_dct,

					   cmd_in, cmd_in_len,

					   cmd_out, cmd_out_len);

		err = mlx5_core_create_dct(dev, &obj->core_dct, cmd_in,

					   cmd_in_len, cmd_out, cmd_out_len);

	} else if (opcode == MLX5_CMD_OP_CREATE_CQ) {

		obj->flags |= DEVX_OBJ_FLAGS_CQ;

		obj->core_cq.comp = devx_cq_comp;
@@ -1499,7 +1499,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)( 


obj_destroy:

	if (obj->flags & DEVX_OBJ_FLAGS_DCT)

		mlx5_core_destroy_dct(obj->ib_dev->mdev, &obj->core_dct);

		mlx5_core_destroy_dct(obj->ib_dev, &obj->core_dct);

	else if (obj->flags & DEVX_OBJ_FLAGS_CQ)

		mlx5_core_destroy_cq(obj->ib_dev->mdev, &obj->core_cq);

	else

CRA Git | Maintained and supported by SUSTech CRA and CCSE