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

Commit f3da6577 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

RDMA/mlx5: Initialize SRQ tables on mlx5_ib 



Transfer initialization and cleanup from mlx5_priv struct of
mlx5_core_dev to be part of mlx5_ib_dev. This completes removal
of SRQ from mlx5_core.

Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent b4990804

drivers/infiniband/hw/mlx5/ib_rep.c

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include "ib_rep.h"

#include "srq.h"



static const struct mlx5_ib_profile rep_profile = {

	STAGE_CREATE(MLX5_IB_STAGE_INIT,
@@ -21,6 +22,9 @@ static const struct mlx5_ib_profile rep_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_ROCE,

		     mlx5_ib_stage_rep_roce_init,

		     mlx5_ib_stage_rep_roce_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_SRQ,

		     mlx5_init_srq_table,

		     mlx5_cleanup_srq_table),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,

		     mlx5_ib_stage_dev_res_init,

		     mlx5_ib_stage_dev_res_cleanup),

drivers/infiniband/hw/mlx5/main.c

+7 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "mlx5_ib.h"

#include "ib_rep.h"

#include "cmd.h"

#include "srq.h"

#include <linux/mlx5/fs_helpers.h>

#include <linux/mlx5/accel.h>

#include <rdma/uverbs_std_types.h>
@@ -6308,6 +6309,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_SRQ,

		     mlx5_init_srq_table,

		     mlx5_cleanup_srq_table),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,

		     mlx5_ib_stage_dev_res_init,

		     mlx5_ib_stage_dev_res_cleanup),
@@ -6365,6 +6369,9 @@ static const struct mlx5_ib_profile nic_rep_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_ROCE,

		     mlx5_ib_stage_rep_roce_init,

		     mlx5_ib_stage_rep_roce_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_SRQ,

		     mlx5_init_srq_table,

		     mlx5_cleanup_srq_table),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,

		     mlx5_ib_stage_dev_res_init,

		     mlx5_ib_stage_dev_res_cleanup),

drivers/infiniband/hw/mlx5/mlx5_ib.h

+4 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <linux/mlx5/cq.h>

#include <linux/mlx5/fs.h>

#include <linux/mlx5/qp.h>

#include <linux/mlx5/srq.h>

#include <linux/mlx5/fs.h>

#include <linux/types.h>

#include <linux/mlx5/transobj.h>
@@ -50,6 +49,8 @@ 
#include <rdma/uverbs_ioctl.h>

#include <rdma/mlx5_user_ioctl_cmds.h>



#include "srq.h"



#define mlx5_ib_dbg(_dev, format, arg...)                                      \

	dev_dbg(&(_dev)->ib_dev.dev, "%s:%d:(pid %d): " format, __func__,      \

		__LINE__, current->pid, ##arg)
@@ -774,6 +775,7 @@ enum mlx5_ib_stages { 
	MLX5_IB_STAGE_CAPS,

	MLX5_IB_STAGE_NON_DEFAULT_CB,

	MLX5_IB_STAGE_ROCE,

	MLX5_IB_STAGE_SRQ,

	MLX5_IB_STAGE_DEVICE_RESOURCES,

	MLX5_IB_STAGE_DEVICE_NOTIFIER,

	MLX5_IB_STAGE_ODP,
@@ -942,6 +944,7 @@ struct mlx5_ib_dev { 
	u64			sys_image_guid;

	struct mlx5_memic	memic;

	u16			devx_whitelist_uid;

	struct mlx5_srq_table   srq_table;

};



static inline struct mlx5_ib_cq *to_mibcq(struct mlx5_core_cq *mcq)

drivers/infiniband/hw/mlx5/srq.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


#include <linux/module.h>

#include <linux/mlx5/qp.h>

#include <linux/mlx5/srq.h>

#include <linux/slab.h>

#include <rdma/ib_umem.h>

#include <rdma/ib_user_verbs.h>

drivers/infiniband/hw/mlx5/srq.h

+25 −0
Original line number Diff line number Diff line
@@ -37,6 +37,28 @@ struct mlx5_srq_attr { 


struct mlx5_ib_dev;



struct mlx5_core_srq {

	struct mlx5_core_rsc_common common; /* must be first */

	u32 srqn;

	int max;

	size_t max_gs;

	size_t max_avail_gather;

	int wqe_shift;

	void (*event)(struct mlx5_core_srq *srq, enum mlx5_event e);



	atomic_t refcount;

	struct completion free;

	u16 uid;

};



struct mlx5_srq_table {

	struct notifier_block nb;

	/* protect radix tree

	 */

	spinlock_t lock;

	struct radix_tree_root tree;

};



int mlx5_cmd_create_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,

			struct mlx5_srq_attr *in);

int mlx5_cmd_destroy_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq);
@@ -45,4 +67,7 @@ int mlx5_cmd_query_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq, 
int mlx5_cmd_arm_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq,

		     u16 lwm, int is_srq);

struct mlx5_core_srq *mlx5_cmd_get_srq(struct mlx5_ib_dev *dev, u32 srqn);



int mlx5_init_srq_table(struct mlx5_ib_dev *dev);

void mlx5_cleanup_srq_table(struct mlx5_ib_dev *dev);

#endif /* MLX5_IB_SRQ_H */