| Message ID | 20170319085557.6023-3-leon@kernel.org (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
On Sun, Mar 19, 2017 at 10:55:56AM +0200, Leon Romanovsky wrote: > From: Leon Romanovsky <leonro@mellanox.com> > > IB umem structure has field hugetlb which was assigned, but except > i40iw driver, it was actually never used. > > This patch drops that variable out of the struct ib_umem, removes > all writes to it, get rids of VMA allocation which wasn't used and > removes check hugetlb from i40iw driver, because it is checked anyway in > i40iw_set_hugetlb_values() routine. > > @@ -143,9 +141,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > umem->odp_data = NULL; > > - /* We assume the memory is from hugetlb until proved otherwise */ > - umem->hugetlb = 1; > - > page_list = (struct page **) __get_free_page(GFP_KERNEL); > if (!page_list) { > put_pid(umem->pid); > @@ -153,14 +148,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > return ERR_PTR(-ENOMEM); > } > > - /* > - * if we can't alloc the vma_list, it's not so bad; > - * just assume the memory is not hugetlb memory > - */ > - vma_list = (struct vm_area_struct **) __get_free_page(GFP_KERNEL); > - if (!vma_list) > - umem->hugetlb = 0; > - > npages = ib_umem_num_pages(umem); > > down_write(¤t->mm->mmap_sem); > @@ -194,7 +181,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > ret = get_user_pages(cur_base, > min_t(unsigned long, npages, > PAGE_SIZE / sizeof (struct page *)), > - gup_flags, page_list, vma_list); > + gup_flags, page_list, NULL); > > if (ret < 0) > goto out; > @@ -203,12 +190,8 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > cur_base += ret * PAGE_SIZE; > npages -= ret; > > - for_each_sg(sg_list_start, sg, ret, i) { > - if (vma_list && !is_vm_hugetlb_page(vma_list[i])) > - umem->hugetlb = 0; > - > + for_each_sg(sg_list_start, sg, ret, i) > sg_set_page(sg, page_list[i], PAGE_SIZE, 0); > - } > > /* preparing for next loop */ > sg_list_start = sg; > diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c > index 9b2849979756..59c8d74e3704 100644 > --- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c > +++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c > @@ -1850,7 +1850,7 @@ static struct ib_mr *i40iw_reg_user_mr(struct ib_pd *pd, > iwmr->page_size = region->page_size; > iwmr->page_msk = PAGE_MASK; > > - if (region->hugetlb && (req.reg_type == IW_MEMREG_TYPE_MEM)) > + if (req.reg_type == IW_MEMREG_TYPE_MEM) > i40iw_set_hugetlb_values(start, iwmr); The code in ib_umem_get iterates through __all__ VMA’s corresponding to the user-space buffer and hugetlb field of the umem struct is set only if they are all using huge_pages. So in the essence, umem->hugetlb provides the driver info on whether __all__ pages of the memory region uses huge pages or not. i40iw_set_hugetlb_values only finds the VMA w.r.t the start virtual address of the user-space buffer and checks if __this__ VMA uses hugetlb pages or not. It is a sanity check done on the VMA found. So the question is -- Do we know that only a single VMA represents the user-space buffer backed by huge pages? If not, it doesnt appear that the check in i40iw_set_hugetlb_values will suffice to identify if the entire memory region is composed of huge pages since it doesnt check all the VMAs. umem->hugetlb would be required for it. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Mar 20, 2017 at 09:19:36PM -0500, Shiraz Saleem wrote: > On Sun, Mar 19, 2017 at 10:55:56AM +0200, Leon Romanovsky wrote: > > From: Leon Romanovsky <leonro@mellanox.com> > > > > IB umem structure has field hugetlb which was assigned, but except > > i40iw driver, it was actually never used. > > > > This patch drops that variable out of the struct ib_umem, removes > > all writes to it, get rids of VMA allocation which wasn't used and > > removes check hugetlb from i40iw driver, because it is checked anyway in > > i40iw_set_hugetlb_values() routine. > > > > @@ -143,9 +141,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > > > umem->odp_data = NULL; > > > > - /* We assume the memory is from hugetlb until proved otherwise */ > > - umem->hugetlb = 1; > > - > > page_list = (struct page **) __get_free_page(GFP_KERNEL); > > if (!page_list) { > > put_pid(umem->pid); > > @@ -153,14 +148,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > return ERR_PTR(-ENOMEM); > > } > > > > - /* > > - * if we can't alloc the vma_list, it's not so bad; > > - * just assume the memory is not hugetlb memory > > - */ > > - vma_list = (struct vm_area_struct **) __get_free_page(GFP_KERNEL); > > - if (!vma_list) > > - umem->hugetlb = 0; > > - > > npages = ib_umem_num_pages(umem); > > > > down_write(¤t->mm->mmap_sem); > > @@ -194,7 +181,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > ret = get_user_pages(cur_base, > > min_t(unsigned long, npages, > > PAGE_SIZE / sizeof (struct page *)), > > - gup_flags, page_list, vma_list); > > + gup_flags, page_list, NULL); > > > > if (ret < 0) > > goto out; > > @@ -203,12 +190,8 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > cur_base += ret * PAGE_SIZE; > > npages -= ret; > > > > - for_each_sg(sg_list_start, sg, ret, i) { > > - if (vma_list && !is_vm_hugetlb_page(vma_list[i])) > > - umem->hugetlb = 0; > > - > > + for_each_sg(sg_list_start, sg, ret, i) > > sg_set_page(sg, page_list[i], PAGE_SIZE, 0); > > - } > > > > /* preparing for next loop */ > > sg_list_start = sg; > > > diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c > > index 9b2849979756..59c8d74e3704 100644 > > --- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c > > +++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c > > @@ -1850,7 +1850,7 @@ static struct ib_mr *i40iw_reg_user_mr(struct ib_pd *pd, > > iwmr->page_size = region->page_size; > > iwmr->page_msk = PAGE_MASK; > > > > - if (region->hugetlb && (req.reg_type == IW_MEMREG_TYPE_MEM)) > > + if (req.reg_type == IW_MEMREG_TYPE_MEM) > > i40iw_set_hugetlb_values(start, iwmr); > > The code in ib_umem_get iterates through __all__ VMA’s corresponding to the > user-space buffer and hugetlb field of the umem struct is set only if they > are all using huge_pages. So in the essence, umem->hugetlb provides the > driver info on whether __all__ pages of the memory region uses huge pages > or not. > > i40iw_set_hugetlb_values only finds the VMA w.r.t the start virtual address of > the user-space buffer and checks if __this__ VMA uses hugetlb pages or not. > It is a sanity check done on the VMA found. > > So the question is -- Do we know that only a single VMA represents the user-space > buffer backed by huge pages? > If not, it doesnt appear that the check in i40iw_set_hugetlb_values will suffice to > identify if the entire memory region is composed of huge pages since it doesnt > check all the VMAs. umem->hugetlb would be required for it. You are right and thank you for pointing that. User memory buffer indeed can span more than one VMA. For example one reg_mr with READ property for two adjacent VAMs, one with READ properties and another with READ-WRITE. However, relying on hugetlb which was set during creation is not best thing too. It can be changed during the application run. The mlx5 relies on the mlx5_ib_cont_pages() function to understand the actual layout. Thanks > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Mar 21, 2017 at 10:14:08AM +0200, Leon Romanovsky wrote: > On Mon, Mar 20, 2017 at 09:19:36PM -0500, Shiraz Saleem wrote: > > On Sun, Mar 19, 2017 at 10:55:56AM +0200, Leon Romanovsky wrote: > > > From: Leon Romanovsky <leonro@mellanox.com> > > > > > > IB umem structure has field hugetlb which was assigned, but except > > > i40iw driver, it was actually never used. > > > > > > This patch drops that variable out of the struct ib_umem, removes > > > all writes to it, get rids of VMA allocation which wasn't used and > > > removes check hugetlb from i40iw driver, because it is checked anyway in > > > i40iw_set_hugetlb_values() routine. > > > > > > @@ -143,9 +141,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > > > > > umem->odp_data = NULL; > > > > > > - /* We assume the memory is from hugetlb until proved otherwise */ > > > - umem->hugetlb = 1; > > > - > > > page_list = (struct page **) __get_free_page(GFP_KERNEL); > > > if (!page_list) { > > > put_pid(umem->pid); > > > @@ -153,14 +148,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > > return ERR_PTR(-ENOMEM); > > > } > > > > > > - /* > > > - * if we can't alloc the vma_list, it's not so bad; > > > - * just assume the memory is not hugetlb memory > > > - */ > > > - vma_list = (struct vm_area_struct **) __get_free_page(GFP_KERNEL); > > > - if (!vma_list) > > > - umem->hugetlb = 0; > > > - > > > npages = ib_umem_num_pages(umem); > > > > > > down_write(¤t->mm->mmap_sem); > > > @@ -194,7 +181,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > > ret = get_user_pages(cur_base, > > > min_t(unsigned long, npages, > > > PAGE_SIZE / sizeof (struct page *)), > > > - gup_flags, page_list, vma_list); > > > + gup_flags, page_list, NULL); > > > > > > if (ret < 0) > > > goto out; > > > @@ -203,12 +190,8 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > > cur_base += ret * PAGE_SIZE; > > > npages -= ret; > > > > > > - for_each_sg(sg_list_start, sg, ret, i) { > > > - if (vma_list && !is_vm_hugetlb_page(vma_list[i])) > > > - umem->hugetlb = 0; > > > - > > > + for_each_sg(sg_list_start, sg, ret, i) > > > sg_set_page(sg, page_list[i], PAGE_SIZE, 0); > > > - } > > > > > > /* preparing for next loop */ > > > sg_list_start = sg; > > > > > diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c > > > index 9b2849979756..59c8d74e3704 100644 > > > --- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c > > > +++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c > > > @@ -1850,7 +1850,7 @@ static struct ib_mr *i40iw_reg_user_mr(struct ib_pd *pd, > > > iwmr->page_size = region->page_size; > > > iwmr->page_msk = PAGE_MASK; > > > > > > - if (region->hugetlb && (req.reg_type == IW_MEMREG_TYPE_MEM)) > > > + if (req.reg_type == IW_MEMREG_TYPE_MEM) > > > i40iw_set_hugetlb_values(start, iwmr); > > > > The code in ib_umem_get iterates through __all__ VMA’s corresponding to the > > user-space buffer and hugetlb field of the umem struct is set only if they > > are all using huge_pages. So in the essence, umem->hugetlb provides the > > driver info on whether __all__ pages of the memory region uses huge pages > > or not. > > > > i40iw_set_hugetlb_values only finds the VMA w.r.t the start virtual address of > > the user-space buffer and checks if __this__ VMA uses hugetlb pages or not. > > It is a sanity check done on the VMA found. > > > > > So the question is -- Do we know that only a single VMA represents the user-space > > buffer backed by huge pages? > > If not, it doesnt appear that the check in i40iw_set_hugetlb_values will suffice to > > identify if the entire memory region is composed of huge pages since it doesnt > > check all the VMAs. umem->hugetlb would be required for it. > > You are right and thank you for pointing that. User memory buffer indeed can > span more than one VMA. For example one reg_mr with READ property for > two adjacent VAMs, one with READ properties and another with READ-WRITE. > > However, relying on hugetlb which was set during creation is not best > thing too. It can be changed during the application run. The mlx5 relies on > the mlx5_ib_cont_pages() function to understand the actual layout. > The patch as is, will break us. We believe ib_umem_get is the correct place to scan the VMAs and report if the MR is composed of hugetlb pages via the hugetlb field of umem. This way it can be done in one place and not in each individual driver. Not sure I understand what you mean by MR changing during application run. And how mlx5_ib_cont_pages is helping if this happens. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Mar 21, 2017 at 09:06:44AM -0500, Shiraz Saleem wrote: > On Tue, Mar 21, 2017 at 10:14:08AM +0200, Leon Romanovsky wrote: > > On Mon, Mar 20, 2017 at 09:19:36PM -0500, Shiraz Saleem wrote: > > > On Sun, Mar 19, 2017 at 10:55:56AM +0200, Leon Romanovsky wrote: > > > > From: Leon Romanovsky <leonro@mellanox.com> > > > > > > > > IB umem structure has field hugetlb which was assigned, but except > > > > i40iw driver, it was actually never used. > > > > > > > > This patch drops that variable out of the struct ib_umem, removes > > > > all writes to it, get rids of VMA allocation which wasn't used and > > > > removes check hugetlb from i40iw driver, because it is checked anyway in > > > > i40iw_set_hugetlb_values() routine. > > > > > > > > @@ -143,9 +141,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > > > > > > > umem->odp_data = NULL; > > > > > > > > - /* We assume the memory is from hugetlb until proved otherwise */ > > > > - umem->hugetlb = 1; > > > > - > > > > page_list = (struct page **) __get_free_page(GFP_KERNEL); > > > > if (!page_list) { > > > > put_pid(umem->pid); > > > > @@ -153,14 +148,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > > > return ERR_PTR(-ENOMEM); > > > > } > > > > > > > > - /* > > > > - * if we can't alloc the vma_list, it's not so bad; > > > > - * just assume the memory is not hugetlb memory > > > > - */ > > > > - vma_list = (struct vm_area_struct **) __get_free_page(GFP_KERNEL); > > > > - if (!vma_list) > > > > - umem->hugetlb = 0; > > > > - > > > > npages = ib_umem_num_pages(umem); > > > > > > > > down_write(¤t->mm->mmap_sem); > > > > @@ -194,7 +181,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > > > ret = get_user_pages(cur_base, > > > > min_t(unsigned long, npages, > > > > PAGE_SIZE / sizeof (struct page *)), > > > > - gup_flags, page_list, vma_list); > > > > + gup_flags, page_list, NULL); > > > > > > > > if (ret < 0) > > > > goto out; > > > > @@ -203,12 +190,8 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, > > > > cur_base += ret * PAGE_SIZE; > > > > npages -= ret; > > > > > > > > - for_each_sg(sg_list_start, sg, ret, i) { > > > > - if (vma_list && !is_vm_hugetlb_page(vma_list[i])) > > > > - umem->hugetlb = 0; > > > > - > > > > + for_each_sg(sg_list_start, sg, ret, i) > > > > sg_set_page(sg, page_list[i], PAGE_SIZE, 0); > > > > - } > > > > > > > > /* preparing for next loop */ > > > > sg_list_start = sg; > > > > > > > diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c > > > > index 9b2849979756..59c8d74e3704 100644 > > > > --- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c > > > > +++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c > > > > @@ -1850,7 +1850,7 @@ static struct ib_mr *i40iw_reg_user_mr(struct ib_pd *pd, > > > > iwmr->page_size = region->page_size; > > > > iwmr->page_msk = PAGE_MASK; > > > > > > > > - if (region->hugetlb && (req.reg_type == IW_MEMREG_TYPE_MEM)) > > > > + if (req.reg_type == IW_MEMREG_TYPE_MEM) > > > > i40iw_set_hugetlb_values(start, iwmr); > > > > > > The code in ib_umem_get iterates through __all__ VMA’s corresponding to the > > > user-space buffer and hugetlb field of the umem struct is set only if they > > > are all using huge_pages. So in the essence, umem->hugetlb provides the > > > driver info on whether __all__ pages of the memory region uses huge pages > > > or not. > > > > > > i40iw_set_hugetlb_values only finds the VMA w.r.t the start virtual address of > > > the user-space buffer and checks if __this__ VMA uses hugetlb pages or not. > > > It is a sanity check done on the VMA found. > > > > > > > > So the question is -- Do we know that only a single VMA represents the user-space > > > buffer backed by huge pages? > > > If not, it doesnt appear that the check in i40iw_set_hugetlb_values will suffice to > > > identify if the entire memory region is composed of huge pages since it doesnt > > > check all the VMAs. umem->hugetlb would be required for it. > > > > You are right and thank you for pointing that. User memory buffer indeed can > > span more than one VMA. For example one reg_mr with READ property for > > two adjacent VAMs, one with READ properties and another with READ-WRITE. > > > > However, relying on hugetlb which was set during creation is not best > > thing too. It can be changed during the application run. The mlx5 relies on > > the mlx5_ib_cont_pages() function to understand the actual layout. > > > > The patch as is, will break us. Doug, Please be sure do NOT take this patch. Do you want me to resubmit the series without this patch? > We believe ib_umem_get is the correct > place to scan the VMAs and report if the MR is composed of hugetlb pages via the > hugetlb field of umem. This way it can be done in one place and not in each > individual driver. The problem with this approach that it is done at the creation of umem region. The call to madvise(MADV_NOHUGEPAGE, ...) will clear the hugetlb property from VMA without change of umem->hugetlb variable. Thanks
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index 27f155d2df8d..6455256533df 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -37,7 +37,6 @@ #include <linux/sched/signal.h> #include <linux/sched/mm.h> #include <linux/export.h> -#include <linux/hugetlb.h> #include <linux/slab.h> #include <rdma/ib_umem_odp.h> @@ -85,7 +84,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, { struct ib_umem *umem; struct page **page_list; - struct vm_area_struct **vma_list; unsigned long locked; unsigned long lock_limit; unsigned long cur_base; @@ -143,9 +141,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, umem->odp_data = NULL; - /* We assume the memory is from hugetlb until proved otherwise */ - umem->hugetlb = 1; - page_list = (struct page **) __get_free_page(GFP_KERNEL); if (!page_list) { put_pid(umem->pid); @@ -153,14 +148,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, return ERR_PTR(-ENOMEM); } - /* - * if we can't alloc the vma_list, it's not so bad; - * just assume the memory is not hugetlb memory - */ - vma_list = (struct vm_area_struct **) __get_free_page(GFP_KERNEL); - if (!vma_list) - umem->hugetlb = 0; - npages = ib_umem_num_pages(umem); down_write(¤t->mm->mmap_sem); @@ -194,7 +181,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, ret = get_user_pages(cur_base, min_t(unsigned long, npages, PAGE_SIZE / sizeof (struct page *)), - gup_flags, page_list, vma_list); + gup_flags, page_list, NULL); if (ret < 0) goto out; @@ -203,12 +190,8 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, cur_base += ret * PAGE_SIZE; npages -= ret; - for_each_sg(sg_list_start, sg, ret, i) { - if (vma_list && !is_vm_hugetlb_page(vma_list[i])) - umem->hugetlb = 0; - + for_each_sg(sg_list_start, sg, ret, i) sg_set_page(sg, page_list[i], PAGE_SIZE, 0); - } /* preparing for next loop */ sg_list_start = sg; @@ -237,8 +220,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, current->mm->pinned_vm = locked; up_write(¤t->mm->mmap_sem); - if (vma_list) - free_page((unsigned long) vma_list); free_page((unsigned long) page_list); return ret < 0 ? ERR_PTR(ret) : umem; diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c index cb2742b548bb..2d7b90b63ba0 100644 --- a/drivers/infiniband/core/umem_odp.c +++ b/drivers/infiniband/core/umem_odp.c @@ -325,7 +325,6 @@ int ib_umem_odp_get(struct ib_ucontext *context, struct ib_umem *umem) goto out_mm; } - umem->hugetlb = 0; umem->odp_data = kzalloc(sizeof(*umem->odp_data), GFP_KERNEL); if (!umem->odp_data) { ret_val = -ENOMEM; diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c index 33af2e3de399..60c86fe5a5a4 100644 --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c @@ -3063,16 +3063,12 @@ struct ib_mr *bnxt_re_reg_user_mr(struct ib_pd *ib_pd, u64 start, u64 length, pbl_tbl_orig = pbl_tbl; page_shift = ilog2(umem->page_size); - if (umem->hugetlb) { - dev_err(rdev_to_dev(rdev), "umem hugetlb not supported!"); - rc = -EFAULT; - goto fail; - } if (umem->page_size != PAGE_SIZE) { dev_err(rdev_to_dev(rdev), "umem page size unsupported!"); rc = -EFAULT; goto fail; } + /* Map umem buf ptrs to the PBL */ for_each_sg(umem->sg_head.sgl, sg, umem->nmap, entry) { pages = sg_dma_len(sg) >> page_shift; diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c index 9b2849979756..59c8d74e3704 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c +++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c @@ -1850,7 +1850,7 @@ static struct ib_mr *i40iw_reg_user_mr(struct ib_pd *pd, iwmr->page_size = region->page_size; iwmr->page_msk = PAGE_MASK; - if (region->hugetlb && (req.reg_type == IW_MEMREG_TYPE_MEM)) + if (req.reg_type == IW_MEMREG_TYPE_MEM) i40iw_set_hugetlb_values(start, iwmr); region_length = region->length + (start & (iwmr->page_size - 1)); diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index c49db7c33979..f836f35f87ab 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -36,7 +36,6 @@ #include <linux/dma-mapping.h> #include <linux/sched/signal.h> #include <linux/sched/mm.h> -#include <linux/hugetlb.h> #include <linux/iommu.h> #include <linux/workqueue.h> #include <linux/list.h> diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h index 2d83cfd7e6ce..3d06d25a33ac 100644 --- a/include/rdma/ib_umem.h +++ b/include/rdma/ib_umem.h @@ -46,7 +46,6 @@ struct ib_umem { unsigned long address; int page_size; int writable; - int hugetlb; struct work_struct work; struct pid *pid; struct mm_struct *mm;