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

ocrdma: Support ib_alloc_mr verb 



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

drivers/infiniband/hw/ocrdma/ocrdma_main.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static int ocrdma_register_device(struct ocrdma_dev *dev) 
	dev->ibdev.dereg_mr = ocrdma_dereg_mr;

	dev->ibdev.reg_user_mr = ocrdma_reg_user_mr;



	dev->ibdev.alloc_fast_reg_mr = ocrdma_alloc_frmr;

	dev->ibdev.alloc_mr = ocrdma_alloc_mr;

	dev->ibdev.alloc_fast_reg_page_list = ocrdma_alloc_frmr_page_list;

	dev->ibdev.free_fast_reg_page_list = ocrdma_free_frmr_page_list;

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c

+8 −3
Original line number Diff line number Diff line
@@ -2998,21 +2998,26 @@ int ocrdma_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags cq_flags) 
	return 0;

}



struct ib_mr *ocrdma_alloc_frmr(struct ib_pd *ibpd, int max_page_list_len)

struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,

			      enum ib_mr_type mr_type,

			      u32 max_num_sg)

{

	int status;

	struct ocrdma_mr *mr;

	struct ocrdma_pd *pd = get_ocrdma_pd(ibpd);

	struct ocrdma_dev *dev = get_ocrdma_dev(ibpd->device);



	if (max_page_list_len > dev->attr.max_pages_per_frmr)

	if (mr_type != IB_MR_TYPE_MEM_REG)

		return ERR_PTR(-EINVAL);



	if (max_num_sg > dev->attr.max_pages_per_frmr)

		return ERR_PTR(-EINVAL);



	mr = kzalloc(sizeof(*mr), GFP_KERNEL);

	if (!mr)

		return ERR_PTR(-ENOMEM);



	status = ocrdma_get_pbl_info(dev, mr, max_page_list_len);

	status = ocrdma_get_pbl_info(dev, mr, max_num_sg);

	if (status)

		goto pbl_err;

	mr->hwmr.fr_mr = 1;

drivers/infiniband/hw/ocrdma/ocrdma_verbs.h

+3 −1
Original line number Diff line number Diff line
@@ -111,7 +111,9 @@ struct ib_mr *ocrdma_reg_kernel_mr(struct ib_pd *, 
				   int num_phys_buf, int acc, u64 *iova_start);

struct ib_mr *ocrdma_reg_user_mr(struct ib_pd *, u64 start, u64 length,

				 u64 virt, int acc, struct ib_udata *);

struct ib_mr *ocrdma_alloc_frmr(struct ib_pd *pd, int max_page_list_len);

struct ib_mr *ocrdma_alloc_mr(struct ib_pd *pd,

			      enum ib_mr_type mr_type,

			      u32 max_num_sg);

struct ib_fast_reg_page_list *ocrdma_alloc_frmr_page_list(struct ib_device

							*ibdev,

							int page_list_len);