Commit 679e34d1 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Doug Ledford
Browse files

mlx4: Support ib_alloc_mr verb 



Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent b3778ba8

drivers/infiniband/hw/mlx4/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2294,7 +2294,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	ibdev->ib_dev.reg_user_mr	= mlx4_ib_reg_user_mr;

	ibdev->ib_dev.rereg_user_mr	= mlx4_ib_rereg_user_mr;

	ibdev->ib_dev.dereg_mr		= mlx4_ib_dereg_mr;

	ibdev->ib_dev.alloc_fast_reg_mr = mlx4_ib_alloc_fast_reg_mr;

	ibdev->ib_dev.alloc_mr		= mlx4_ib_alloc_mr;

	ibdev->ib_dev.alloc_fast_reg_page_list = mlx4_ib_alloc_fast_reg_page_list;

	ibdev->ib_dev.free_fast_reg_page_list  = mlx4_ib_free_fast_reg_page_list;

	ibdev->ib_dev.attach_mcast	= mlx4_ib_mcg_attach;

drivers/infiniband/hw/mlx4/mlx4_ib.h

+3 −2
Original line number Diff line number Diff line
@@ -680,8 +680,9 @@ struct ib_mw *mlx4_ib_alloc_mw(struct ib_pd *pd, enum ib_mw_type type); 
int mlx4_ib_bind_mw(struct ib_qp *qp, struct ib_mw *mw,

		    struct ib_mw_bind *mw_bind);

int mlx4_ib_dealloc_mw(struct ib_mw *mw);

struct ib_mr *mlx4_ib_alloc_fast_reg_mr(struct ib_pd *pd,

					int max_page_list_len);

struct ib_mr *mlx4_ib_alloc_mr(struct ib_pd *pd,

			       enum ib_mr_type mr_type,

			       u32 max_num_sg);

struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_device *ibdev,

							       int page_list_len);

void mlx4_ib_free_fast_reg_page_list(struct ib_fast_reg_page_list *page_list);

drivers/infiniband/hw/mlx4/mr.c

+8 −3
Original line number Diff line number Diff line
@@ -350,19 +350,24 @@ int mlx4_ib_dealloc_mw(struct ib_mw *ibmw) 
	return 0;

}



struct ib_mr *mlx4_ib_alloc_fast_reg_mr(struct ib_pd *pd,

					int max_page_list_len)

struct ib_mr *mlx4_ib_alloc_mr(struct ib_pd *pd,

			       enum ib_mr_type mr_type,

			       u32 max_num_sg)

{

	struct mlx4_ib_dev *dev = to_mdev(pd->device);

	struct mlx4_ib_mr *mr;

	int err;



	if (mr_type != IB_MR_TYPE_MEM_REG ||

	    max_num_sg > MLX4_MAX_FAST_REG_PAGES)

		return ERR_PTR(-EINVAL);



	mr = kmalloc(sizeof *mr, GFP_KERNEL);

	if (!mr)

		return ERR_PTR(-ENOMEM);



	err = mlx4_mr_alloc(dev->dev, to_mpd(pd)->pdn, 0, 0, 0,

			    max_page_list_len, 0, &mr->mmr);

			    max_num_sg, 0, &mr->mmr);

	if (err)

		goto err_free;