Commit 42a3b153 authored by Gal Pressman's avatar Gal Pressman Committed by Jason Gunthorpe
Browse files

RDMA: Remove the udata parameter from alloc_mr callback 

Allocating an MR flow can only be initiated by kernel users, and not from
userspace so a udata parameter is redundant.

Link: https://lore.kernel.org/r/20200706120343.10816-4-galpress@amazon.com


Signed-off-by: default avatarGal Pressman <galpress@amazon.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent b64b74b1

drivers/infiniband/core/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -2131,7 +2131,7 @@ struct ib_mr *ib_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type, 
		goto out;

	}



	mr = pd->device->ops.alloc_mr(pd, mr_type, max_num_sg, NULL);

	mr = pd->device->ops.alloc_mr(pd, mr_type, max_num_sg);

	if (IS_ERR(mr))

		goto out;

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -3569,7 +3569,7 @@ int bnxt_re_map_mr_sg(struct ib_mr *ib_mr, struct scatterlist *sg, int sg_nents, 
}



struct ib_mr *bnxt_re_alloc_mr(struct ib_pd *ib_pd, enum ib_mr_type type,

			       u32 max_num_sg, struct ib_udata *udata)

			       u32 max_num_sg)

{

	struct bnxt_re_pd *pd = container_of(ib_pd, struct bnxt_re_pd, ib_pd);

	struct bnxt_re_dev *rdev = pd->rdev;

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ struct ib_mr *bnxt_re_get_dma_mr(struct ib_pd *pd, int mr_access_flags); 
int bnxt_re_map_mr_sg(struct ib_mr *ib_mr, struct scatterlist *sg, int sg_nents,

		      unsigned int *sg_offset);

struct ib_mr *bnxt_re_alloc_mr(struct ib_pd *ib_pd, enum ib_mr_type mr_type,

			       u32 max_num_sg, struct ib_udata *udata);

			       u32 max_num_sg);

int bnxt_re_dereg_mr(struct ib_mr *mr, struct ib_udata *udata);

struct ib_mw *bnxt_re_alloc_mw(struct ib_pd *ib_pd, enum ib_mw_type type,

			       struct ib_udata *udata);

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+1 −1
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ int c4iw_reject_cr(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len); 
void c4iw_qp_add_ref(struct ib_qp *qp);

void c4iw_qp_rem_ref(struct ib_qp *qp);

struct ib_mr *c4iw_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type,

			    u32 max_num_sg, struct ib_udata *udata);

			    u32 max_num_sg);

int c4iw_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents,

		   unsigned int *sg_offset);

int c4iw_dealloc_mw(struct ib_mw *mw);

drivers/infiniband/hw/cxgb4/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ int c4iw_dealloc_mw(struct ib_mw *mw) 
}



struct ib_mr *c4iw_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type,

			    u32 max_num_sg, struct ib_udata *udata)

			    u32 max_num_sg)

{

	struct c4iw_dev *rhp;

	struct c4iw_pd *php;