diff mbox series

[rdma-next,6/6] RDMA/umem: Remove hugetlb flag

Message ID 20181224223227.18016-7-shiraz.saleem@intel.com (mailing list archive)
State Changes Requested
Headers show
Series Introduce APIs to get DMA addresses aligned to a HW supported page size | expand

Commit Message

Saleem, Shiraz Dec. 24, 2018, 10:32 p.m. UTC 
The drivers i40iw and bnxt_re no longer dependent on the
hugetlb flag. So remove this flag from ib_umem structure.

Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
---
 drivers/infiniband/core/umem.c     | 15 ---------------
 drivers/infiniband/core/umem_odp.c |  3 ---
 include/rdma/ib_umem.h             |  1 -
 3 files changed, 19 deletions(-)

Comments

Jason Gunthorpe Jan. 3, 2019, 12:22 a.m. UTC | #1 
On Mon, Dec 24, 2018 at 04:32:27PM -0600, Shiraz Saleem wrote:
> The drivers i40iw and bnxt_re no longer dependent on the
> hugetlb flag. So remove this flag from ib_umem structure.
> 
> Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
> Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
> ---
>  drivers/infiniband/core/umem.c     | 15 ---------------
>  drivers/infiniband/core/umem_odp.c |  3 ---
>  include/rdma/ib_umem.h             |  1 -
>  3 files changed, 19 deletions(-)

This is fine too.

Lets get the drivers fixed and then everything should be good to go!

Jason
diff mbox series

Patch

diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 8f8a1f6..19534ef 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -306,7 +306,6 @@  struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
 	struct mm_struct *mm;
 	unsigned long npages;
 	int ret;
-	int i;
 	unsigned long dma_attrs = 0;
 	struct scatterlist *sg_cur, *sg_nxt;
 	unsigned int gup_flags = FOLL_WRITE;
@@ -351,9 +350,6 @@  struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
 		return umem;
 	}
 
-	/* 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) {
 		ret = -ENOMEM;
@@ -365,8 +361,6 @@  struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
 	 * 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);
 	if (npages == 0 || npages > UINT_MAX) {
@@ -414,15 +408,6 @@  struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
 		npages   -= ret;
 
 		ib_umem_add_sg_table(&sg_cur, &sg_nxt, page_list, ret);
-
-		/* Continue to hold the mmap_sem as vma_list access
-		 * needs to be protected.
-		 */
-		for (i = 0; i < ret && umem->hugetlb; i++) {
-			if (vma_list && !is_vm_hugetlb_page(vma_list[i]))
-				umem->hugetlb = 0;
-		}
-
 		up_read(&mm->mmap_sem);
 	}
 
diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c
index 9608681..33c188e 100644
--- a/drivers/infiniband/core/umem_odp.c
+++ b/drivers/infiniband/core/umem_odp.c
@@ -416,9 +416,6 @@  int ib_umem_odp_get(struct ib_umem_odp *umem_odp, int access)
 		h = hstate_vma(vma);
 		umem->page_shift = huge_page_shift(h);
 		up_read(&mm->mmap_sem);
-		umem->hugetlb = 1;
-	} else {
-		umem->hugetlb = 0;
 	}
 
 	mutex_init(&umem_odp->umem_mutex);
diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h
index 57cc621..770d249 100644
--- a/include/rdma/ib_umem.h
+++ b/include/rdma/ib_umem.h
@@ -47,7 +47,6 @@  struct ib_umem {
 	unsigned long		address;
 	int			page_shift;
 	u32 writable : 1;
-	u32 hugetlb : 1;
 	u32 is_odp : 1;
 	struct work_struct	work;
 	struct sg_table sg_head;