nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

IB/umem: Add support to huge ODP

Browse source 
Add IB_ACCESS_HUGETLB ib_reg_mr flag.
Hugetlb region registered with this flag
will use single translation entry per huge page.

Signed-off-by: Artemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Artemy Kovalyov 2017-04-05 09:23:57 +03:00 committed by Doug Ledford
parent b2ac91885b
commit 0008b84ea9
4 changed files with 23 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/infiniband/core/umem.c
View file

@ -133,7 +133,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
if (access & IB_ACCESS_ON_DEMAND) { if (access & IB_ACCESS_ON_DEMAND) {
put_pid(umem->pid); put_pid(umem->pid);
ret = ib_umem_odp_get(context, umem); ret = ib_umem_odp_get(context, umem, access);
if (ret) { if (ret) {
kfree(umem); kfree(umem);
return ERR_PTR(ret); return ERR_PTR(ret);

19
drivers/infiniband/core/umem_odp.c
View file

@ -38,6 +38,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/hugetlb.h>
#include <rdma/ib_verbs.h> #include <rdma/ib_verbs.h>
#include <rdma/ib_umem.h> #include <rdma/ib_umem.h>
@ -306,7 +307,8 @@ struct ib_umem *ib_alloc_odp_umem(struct ib_ucontext *context,
} }
EXPORT_SYMBOL(ib_alloc_odp_umem); EXPORT_SYMBOL(ib_alloc_odp_umem);
int ib_umem_odp_get(struct ib_ucontext *context, struct ib_umem *umem) int ib_umem_odp_get(struct ib_ucontext *context, struct ib_umem *umem,
int access)
{ {
int ret_val; int ret_val;
struct pid *our_pid; struct pid *our_pid;
@ -315,6 +317,20 @@ int ib_umem_odp_get(struct ib_ucontext *context, struct ib_umem *umem)
if (!mm) if (!mm)
return -EINVAL; return -EINVAL;
if (access & IB_ACCESS_HUGETLB) {
struct vm_area_struct *vma;
struct hstate *h;
vma = find_vma(mm, ib_umem_start(umem));
if (!vma || !is_vm_hugetlb_page(vma))
return -EINVAL;
h = hstate_vma(vma);
umem->page_shift = huge_page_shift(h);
umem->hugetlb = 1;
} else {
umem->hugetlb = 0;
}
/* Prevent creating ODP MRs in child processes */ /* Prevent creating ODP MRs in child processes */
rcu_read_lock(); rcu_read_lock();
our_pid = get_task_pid(current->group_leader, PIDTYPE_PID); our_pid = get_task_pid(current->group_leader, PIDTYPE_PID);
@ -325,7 +341,6 @@ int ib_umem_odp_get(struct ib_ucontext *context, struct ib_umem *umem)
goto out_mm; goto out_mm;
} }
umem->hugetlb = 0;
umem->odp_data = kzalloc(sizeof(*umem->odp_data), GFP_KERNEL); umem->odp_data = kzalloc(sizeof(*umem->odp_data), GFP_KERNEL);
if (!umem->odp_data) { if (!umem->odp_data) {
ret_val = -ENOMEM; ret_val = -ENOMEM;

6
include/rdma/ib_umem_odp.h
View file

@ -84,7 +84,8 @@ struct ib_umem_odp {
#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
int ib_umem_odp_get(struct ib_ucontext *context, struct ib_umem *umem); int ib_umem_odp_get(struct ib_ucontext *context, struct ib_umem *umem,
int access);
struct ib_umem *ib_alloc_odp_umem(struct ib_ucontext *context, struct ib_umem *ib_alloc_odp_umem(struct ib_ucontext *context,
unsigned long addr, unsigned long addr,
size_t size); size_t size);
@ -154,7 +155,8 @@ static inline int ib_umem_mmu_notifier_retry(struct ib_umem *item,
#else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */ #else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */
static inline int ib_umem_odp_get(struct ib_ucontext *context, static inline int ib_umem_odp_get(struct ib_ucontext *context,
struct ib_umem *umem) struct ib_umem *umem,
int access)
{ {
return -EINVAL; return -EINVAL;
} }

1
include/rdma/ib_verbs.h
View file

@ -1339,6 +1339,7 @@ enum ib_access_flags {
IB_ACCESS_MW_BIND = (1<<4), IB_ACCESS_MW_BIND = (1<<4),
IB_ZERO_BASED = (1<<5), IB_ZERO_BASED = (1<<5),
IB_ACCESS_ON_DEMAND = (1<<6), IB_ACCESS_ON_DEMAND = (1<<6),
IB_ACCESS_HUGETLB = (1<<7),
}; };
/* /*