Commit 333fbaa0 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

net/mlx5: Move QP logic to mlx5_ib 



The mlx5_core doesn't need any functionality coded in qp.c, so move
that file to drivers/infiniband/ be under mlx5_ib responsibility.

Reviewed-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 42f9bbd1

drivers/infiniband/hw/mlx5/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ mlx5_ib-y := ah.o \ 
	     mem.o \

	     mr.o \

	     qp.o \

	     qpc.o \

	     restrack.o \

	     srq.o \

	     srq_cmd.o

drivers/infiniband/hw/mlx5/cq.c

+2 −1
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)

{
@@ -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

+5 −5
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
@@ -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

drivers/infiniband/hw/mlx5/main.c

+8 −2
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include "ib_rep.h"

#include "cmd.h"

#include "srq.h"

#include "qp.h"

#include <linux/mlx5/fs_helpers.h>

#include <linux/mlx5/accel.h>

#include <rdma/uverbs_std_types.h>
@@ -4632,8 +4633,7 @@ static void delay_drop_handler(struct work_struct *work) 
	atomic_inc(&delay_drop->events_cnt);



	mutex_lock(&delay_drop->lock);

	err = mlx5_core_set_delay_drop(delay_drop->dev->mdev,

				       delay_drop->timeout);

	err = mlx5_core_set_delay_drop(delay_drop->dev, delay_drop->timeout);

	if (err) {

		mlx5_ib_warn(delay_drop->dev, "Failed to set delay drop, timeout=%u\n",

			     delay_drop->timeout);
@@ -7193,6 +7193,9 @@ static const struct mlx5_ib_profile pf_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_ROCE,

		     mlx5_ib_stage_roce_init,

		     mlx5_ib_stage_roce_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_QP,

		     mlx5_init_qp_table,

		     mlx5_cleanup_qp_table),

	STAGE_CREATE(MLX5_IB_STAGE_SRQ,

		     mlx5_init_srq_table,

		     mlx5_cleanup_srq_table),
@@ -7250,6 +7253,9 @@ const struct mlx5_ib_profile raw_eth_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_ROCE,

		     mlx5_ib_stage_raw_eth_roce_init,

		     mlx5_ib_stage_raw_eth_roce_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_QP,

		     mlx5_init_qp_table,

		     mlx5_cleanup_qp_table),

	STAGE_CREATE(MLX5_IB_STAGE_SRQ,

		     mlx5_init_srq_table,

		     mlx5_cleanup_srq_table),

drivers/infiniband/hw/mlx5/mlx5_ib.h

+2 −0
Original line number Diff line number Diff line
@@ -869,6 +869,7 @@ enum mlx5_ib_stages { 
	MLX5_IB_STAGE_CAPS,

	MLX5_IB_STAGE_NON_DEFAULT_CB,

	MLX5_IB_STAGE_ROCE,

	MLX5_IB_STAGE_QP,

	MLX5_IB_STAGE_SRQ,

	MLX5_IB_STAGE_DEVICE_RESOURCES,

	MLX5_IB_STAGE_DEVICE_NOTIFIER,
@@ -1064,6 +1065,7 @@ struct mlx5_ib_dev { 
	struct mlx5_dm		dm;

	u16			devx_whitelist_uid;

	struct mlx5_srq_table   srq_table;

	struct mlx5_qp_table    qp_table;

	struct mlx5_async_ctx   async_ctx;

	struct mlx5_devx_event_table devx_event_table;

	struct mlx5_var_table var_table;

CRA Git | Maintained and supported by SUSTech CRA and CCSE