Commit b64b74b1 authored by Gal Pressman's avatar Gal Pressman Committed by Jason Gunthorpe

RDMA/core: Remove ib_alloc_mr_user function

Allocating an MR flow can only be initiated by kernel users, and not from
userspace. As a result, the udata parameter is always being passed as
NULL. Rename ib_alloc_mr_user function to ib_alloc_mr and remove the udata
parameter.

Link: https://lore.kernel.org/r/20200706120343.10816-3-galpress@amazon.comSigned-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 c5f42b21
...@@ -2104,11 +2104,10 @@ int ib_dereg_mr_user(struct ib_mr *mr, struct ib_udata *udata) ...@@ -2104,11 +2104,10 @@ int ib_dereg_mr_user(struct ib_mr *mr, struct ib_udata *udata)
EXPORT_SYMBOL(ib_dereg_mr_user); EXPORT_SYMBOL(ib_dereg_mr_user);
/** /**
* ib_alloc_mr_user() - Allocates a memory region * ib_alloc_mr() - Allocates a memory region
* @pd: protection domain associated with the region * @pd: protection domain associated with the region
* @mr_type: memory region type * @mr_type: memory region type
* @max_num_sg: maximum sg entries available for registration. * @max_num_sg: maximum sg entries available for registration.
* @udata: user data or null for kernel objects
* *
* Notes: * Notes:
* Memory registeration page/sg lists must not exceed max_num_sg. * Memory registeration page/sg lists must not exceed max_num_sg.
...@@ -2116,8 +2115,8 @@ EXPORT_SYMBOL(ib_dereg_mr_user); ...@@ -2116,8 +2115,8 @@ EXPORT_SYMBOL(ib_dereg_mr_user);
* max_num_sg * used_page_size. * max_num_sg * used_page_size.
* *
*/ */
struct ib_mr *ib_alloc_mr_user(struct ib_pd *pd, enum ib_mr_type mr_type, struct ib_mr *ib_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 ib_mr *mr; struct ib_mr *mr;
...@@ -2132,7 +2131,7 @@ struct ib_mr *ib_alloc_mr_user(struct ib_pd *pd, enum ib_mr_type mr_type, ...@@ -2132,7 +2131,7 @@ struct ib_mr *ib_alloc_mr_user(struct ib_pd *pd, enum ib_mr_type mr_type,
goto out; goto out;
} }
mr = pd->device->ops.alloc_mr(pd, mr_type, max_num_sg, udata); mr = pd->device->ops.alloc_mr(pd, mr_type, max_num_sg, NULL);
if (IS_ERR(mr)) if (IS_ERR(mr))
goto out; goto out;
...@@ -2151,7 +2150,7 @@ struct ib_mr *ib_alloc_mr_user(struct ib_pd *pd, enum ib_mr_type mr_type, ...@@ -2151,7 +2150,7 @@ struct ib_mr *ib_alloc_mr_user(struct ib_pd *pd, enum ib_mr_type mr_type,
trace_mr_alloc(pd, mr_type, max_num_sg, mr); trace_mr_alloc(pd, mr_type, max_num_sg, mr);
return mr; return mr;
} }
EXPORT_SYMBOL(ib_alloc_mr_user); EXPORT_SYMBOL(ib_alloc_mr);
/** /**
* ib_alloc_mr_integrity() - Allocates an integrity memory region * ib_alloc_mr_integrity() - Allocates an integrity memory region
......
...@@ -4269,14 +4269,8 @@ static inline int ib_dereg_mr(struct ib_mr *mr) ...@@ -4269,14 +4269,8 @@ static inline int ib_dereg_mr(struct ib_mr *mr)
return ib_dereg_mr_user(mr, NULL); return ib_dereg_mr_user(mr, NULL);
} }
struct ib_mr *ib_alloc_mr_user(struct ib_pd *pd, enum ib_mr_type mr_type, struct ib_mr *ib_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type,
u32 max_num_sg, struct ib_udata *udata); u32 max_num_sg);
static inline struct ib_mr *ib_alloc_mr(struct ib_pd *pd,
enum ib_mr_type mr_type, u32 max_num_sg)
{
return ib_alloc_mr_user(pd, mr_type, max_num_sg, NULL);
}
struct ib_mr *ib_alloc_mr_integrity(struct ib_pd *pd, struct ib_mr *ib_alloc_mr_integrity(struct ib_pd *pd,
u32 max_num_data_sg, u32 max_num_data_sg,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment