Commit 0c16d963 authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Jason Gunthorpe
Browse files

RDMA/umem: Move to allocate SG table from pages 

Remove the implementation of ib_umem_add_sg_table and instead
call to __sg_alloc_table_from_pages which already has the logic to
merge contiguous pages.

Besides that it removes duplicated functionality, it reduces the
memory consumption of the SG table significantly. Prior to this
patch, the SG table was allocated in advance regardless consideration
of contiguous pages.

In huge pages system of 2MB page size, without this change, the SG table
would contain x512 SG entries.
E.g. for 100GB memory registration:

	 Number of entries	Size
Before 	      26214400          600.0MB
After            51200		  1.2MB

Link: https://lore.kernel.org/r/20201004154340.1080481-5-leon@kernel.org


Signed-off-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 07da1223

drivers/infiniband/core/umem.c

+12 −82
Original line number Diff line number Diff line
@@ -60,73 +60,6 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d 
	sg_free_table(&umem->sg_head);

}



/* ib_umem_add_sg_table - Add N contiguous pages to scatter table

 *

 * sg: current scatterlist entry

 * page_list: array of npage struct page pointers

 * npages: number of pages in page_list

 * max_seg_sz: maximum segment size in bytes

 * nents: [out] number of entries in the scatterlist

 *

 * Return new end of scatterlist

 */

static struct scatterlist *ib_umem_add_sg_table(struct scatterlist *sg,

						struct page **page_list,

						unsigned long npages,

						unsigned int max_seg_sz,

						int *nents)

{

	unsigned long first_pfn;

	unsigned long i = 0;

	bool update_cur_sg = false;

	bool first = !sg_page(sg);



	/* Check if new page_list is contiguous with end of previous page_list.

	 * sg->length here is a multiple of PAGE_SIZE and sg->offset is 0.

	 */

	if (!first && (page_to_pfn(sg_page(sg)) + (sg->length >> PAGE_SHIFT) ==

		       page_to_pfn(page_list[0])))

		update_cur_sg = true;



	while (i != npages) {

		unsigned long len;

		struct page *first_page = page_list[i];



		first_pfn = page_to_pfn(first_page);



		/* Compute the number of contiguous pages we have starting

		 * at i

		 */

		for (len = 0; i != npages &&

			      first_pfn + len == page_to_pfn(page_list[i]) &&

			      len < (max_seg_sz >> PAGE_SHIFT);

		     len++)

			i++;



		/* Squash N contiguous pages from page_list into current sge */

		if (update_cur_sg) {

			if ((max_seg_sz - sg->length) >= (len << PAGE_SHIFT)) {

				sg_set_page(sg, sg_page(sg),

					    sg->length + (len << PAGE_SHIFT),

					    0);

				update_cur_sg = false;

				continue;

			}

			update_cur_sg = false;

		}



		/* Squash N contiguous pages into next sge or first sge */

		if (!first)

			sg = sg_next(sg);



		(*nents)++;

		sg_set_page(sg, first_page, len << PAGE_SHIFT, 0);

		first = false;

	}



	return sg;

}



/**

 * ib_umem_find_best_pgsz - Find best HW page size to use for this MR

 *
@@ -201,7 +134,7 @@ struct ib_umem *ib_umem_get(struct ib_device *device, unsigned long addr, 
	struct mm_struct *mm;

	unsigned long npages;

	int ret;

	struct scatterlist *sg;

	struct scatterlist *sg = NULL;

	unsigned int gup_flags = FOLL_WRITE;



	/*
@@ -251,15 +184,9 @@ struct ib_umem *ib_umem_get(struct ib_device *device, unsigned long addr, 


	cur_base = addr & PAGE_MASK;



	ret = sg_alloc_table(&umem->sg_head, npages, GFP_KERNEL);

	if (ret)

		goto vma;



	if (!umem->writable)

		gup_flags |= FOLL_FORCE;



	sg = umem->sg_head.sgl;



	while (npages) {

		cond_resched();

		ret = pin_user_pages_fast(cur_base,
@@ -272,13 +199,17 @@ struct ib_umem *ib_umem_get(struct ib_device *device, unsigned long addr, 


		cur_base += ret * PAGE_SIZE;

		npages -= ret;



		sg = ib_umem_add_sg_table(sg, page_list, ret,

			dma_get_max_seg_size(device->dma_device),

			&umem->sg_nents);

		sg = __sg_alloc_table_from_pages(

			&umem->sg_head, page_list, ret, 0, ret << PAGE_SHIFT,

			dma_get_max_seg_size(device->dma_device), sg, npages,

			GFP_KERNEL);

		umem->sg_nents = umem->sg_head.nents;

		if (IS_ERR(sg)) {

			unpin_user_pages_dirty_lock(page_list, ret, 0);

			ret = PTR_ERR(sg);

			goto umem_release;

		}

	}



	sg_mark_end(sg);



	if (access & IB_ACCESS_RELAXED_ORDERING)

		dma_attr |= DMA_ATTR_WEAK_ORDERING;
@@ -297,7 +228,6 @@ struct ib_umem *ib_umem_get(struct ib_device *device, unsigned long addr, 


umem_release:

	__ib_umem_release(device, umem, 0);

vma:

	atomic64_sub(ib_umem_num_pages(umem), &mm->pinned_vm);

out:

	free_page((unsigned long) page_list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE