redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

IB/core: Introduce rdma_user_mmap_entry_insert_range() API 

Introduce rdma_user_mmap_entry_insert_range() API to be used once the
required key for the given entry should be in a given range.

Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Link: https://lore.kernel.org/r/20191212100237.330654-2-leon@kernel.org
Signed-off-by: Doug Ledford <dledford@redhat.com>
alistair/sunxi64-5.5-dsi
Yishai Hadas 2019-12-12 12:02:36 +02:00 committed by Doug Ledford
parent ed9085fed9
commit 7a763d18ff
2 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/infiniband/core/ib_core_uverbs.c
View File

@ -238,28 +238,32 @@ void rdma_user_mmap_entry_remove(struct rdma_user_mmap_entry *entry)
EXPORT_SYMBOL(rdma_user_mmap_entry_remove); EXPORT_SYMBOL(rdma_user_mmap_entry_remove);
/** /**
* rdma_user_mmap_entry_insert() - Insert an entry to the mmap_xa * rdma_user_mmap_entry_insert_range() - Insert an entry to the mmap_xa
* in a given range.
* *
* @ucontext: associated user context. * @ucontext: associated user context.
* @entry: the entry to insert into the mmap_xa * @entry: the entry to insert into the mmap_xa
* @length: length of the address that will be mmapped * @length: length of the address that will be mmapped
* @min_pgoff: minimum pgoff to be returned
* @max_pgoff: maximum pgoff to be returned
* *
* This function should be called by drivers that use the rdma_user_mmap * This function should be called by drivers that use the rdma_user_mmap
* interface for implementing their mmap syscall A database of mmap offsets is * interface for implementing their mmap syscall A database of mmap offsets is
* handled in the core and helper functions are provided to insert entries * handled in the core and helper functions are provided to insert entries
* into the database and extract entries when the user calls mmap with the * into the database and extract entries when the user calls mmap with the
* given offset. The function allocates a unique page offset that should be * given offset. The function allocates a unique page offset in a given range
* provided to user, the user will use the offset to retrieve information such * that should be provided to user, the user will use the offset to retrieve
* as address to be mapped and how. * information such as address to be mapped and how.
* *
* Return: 0 on success and -ENOMEM on failure * Return: 0 on success and -ENOMEM on failure
*/ */
int rdma_user_mmap_entry_insert(struct ib_ucontext *ucontext, int rdma_user_mmap_entry_insert_range(struct ib_ucontext *ucontext,
struct rdma_user_mmap_entry *entry, struct rdma_user_mmap_entry *entry,
size_t length) size_t length, u32 min_pgoff,
u32 max_pgoff)
{ {
struct ib_uverbs_file *ufile = ucontext->ufile; struct ib_uverbs_file *ufile = ucontext->ufile;
XA_STATE(xas, &ucontext->mmap_xa, 0); XA_STATE(xas, &ucontext->mmap_xa, min_pgoff);
u32 xa_first, xa_last, npages; u32 xa_first, xa_last, npages;
int err; int err;
u32 i; u32 i;
@ -285,7 +289,7 @@ int rdma_user_mmap_entry_insert(struct ib_ucontext *ucontext,
entry->npages = npages; entry->npages = npages;
while (true) { while (true) {
/* First find an empty index */ /* First find an empty index */
xas_find_marked(&xas, U32_MAX, XA_FREE_MARK); xas_find_marked(&xas, max_pgoff, XA_FREE_MARK);
if (xas.xa_node == XAS_RESTART) if (xas.xa_node == XAS_RESTART)
goto err_unlock; goto err_unlock;
@ -332,4 +336,30 @@ err_unlock:
mutex_unlock(&ufile->umap_lock); mutex_unlock(&ufile->umap_lock);
return -ENOMEM; return -ENOMEM;
} }
EXPORT_SYMBOL(rdma_user_mmap_entry_insert_range);
/**
* rdma_user_mmap_entry_insert() - Insert an entry to the mmap_xa.
*
* @ucontext: associated user context.
* @entry: the entry to insert into the mmap_xa
* @length: length of the address that will be mmapped
*
* This function should be called by drivers that use the rdma_user_mmap
* interface for handling user mmapped addresses. The database is handled in
* the core and helper functions are provided to insert entries into the
* database and extract entries when the user calls mmap with the given offset.
* The function allocates a unique page offset that should be provided to user,
* the user will use the offset to retrieve information such as address to
* be mapped and how.
*
* Return: 0 on success and -ENOMEM on failure
*/
int rdma_user_mmap_entry_insert(struct ib_ucontext *ucontext,
struct rdma_user_mmap_entry *entry,
size_t length)
{
return rdma_user_mmap_entry_insert_range(ucontext, entry, length, 0,
U32_MAX);
}
EXPORT_SYMBOL(rdma_user_mmap_entry_insert); EXPORT_SYMBOL(rdma_user_mmap_entry_insert);

5
include/rdma/ib_verbs.h
View File

@ -2832,6 +2832,11 @@ int rdma_user_mmap_io(struct ib_ucontext *ucontext, struct vm_area_struct *vma,
int rdma_user_mmap_entry_insert(struct ib_ucontext *ucontext, int rdma_user_mmap_entry_insert(struct ib_ucontext *ucontext,
struct rdma_user_mmap_entry *entry, struct rdma_user_mmap_entry *entry,
size_t length); size_t length);
int rdma_user_mmap_entry_insert_range(struct ib_ucontext *ucontext,
struct rdma_user_mmap_entry *entry,
size_t length, u32 min_pgoff,
u32 max_pgoff);
struct rdma_user_mmap_entry * struct rdma_user_mmap_entry *
rdma_user_mmap_entry_get_pgoff(struct ib_ucontext *ucontext, rdma_user_mmap_entry_get_pgoff(struct ib_ucontext *ucontext,
unsigned long pgoff); unsigned long pgoff);