Commit f1f6a7dd authored by John Hubbard's avatar John Hubbard Committed by Linus Torvalds
Browse files

mm, tree-wide: rename put_user_page*() to unpin_user_page*() 

In order to provide a clearer, more symmetric API for pinning and
unpinning DMA pages.  This way, pin_user_pages*() calls match up with
unpin_user_pages*() calls, and the API is a lot closer to being
self-explanatory.

Link: http://lkml.kernel.org/r/20200107224558.2362728-23-jhubbard@nvidia.com


Signed-off-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Björn Töpel <bjorn.topel@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Leon Romanovsky <leonro@mellanox.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bdffe23e

Documentation/core-api/pin_user_pages.rst

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ since the system was booted, via two new /proc/vmstat entries: :: 
    /proc/vmstat/nr_foll_pin_requested



Those are both going to show zero, unless CONFIG_DEBUG_VM is set. This is

because there is a noticeable performance drop in put_user_page(), when they

because there is a noticeable performance drop in unpin_user_page(), when they

are activated.



References

arch/powerpc/mm/book3s64/iommu_api.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static long mm_iommu_do_alloc(struct mm_struct *mm, unsigned long ua, 


free_exit:

	/* free the references taken */

	put_user_pages(mem->hpages, pinned);

	unpin_user_pages(mem->hpages, pinned);



	vfree(mem->hpas);

	kfree(mem);
@@ -214,7 +214,7 @@ static void mm_iommu_unpin(struct mm_iommu_table_group_mem_t *mem) 
		if (mem->hpas[i] & MM_IOMMU_TABLE_GROUP_PAGE_DIRTY)

			SetPageDirty(page);



		put_user_page(page);

		unpin_user_page(page);



		mem->hpas[i] = 0;

	}

drivers/gpu/drm/via/via_dmablit.c

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) 
		kfree(vsg->desc_pages);

		/* fall through */

	case dr_via_pages_locked:

		put_user_pages_dirty_lock(vsg->pages, vsg->num_pages,

		unpin_user_pages_dirty_lock(vsg->pages, vsg->num_pages,

					   (vsg->direction == DMA_FROM_DEVICE));

		/* fall through */

	case dr_via_pages_alloc:

drivers/infiniband/core/umem.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d 


	for_each_sg_page(umem->sg_head.sgl, &sg_iter, umem->sg_nents, 0) {

		page = sg_page_iter_page(&sg_iter);

		put_user_pages_dirty_lock(&page, 1, umem->writable && dirty);

		unpin_user_pages_dirty_lock(&page, 1, umem->writable && dirty);

	}



	sg_free_table(&umem->sg_head);

drivers/infiniband/hw/hfi1/user_pages.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ int hfi1_acquire_user_pages(struct mm_struct *mm, unsigned long vaddr, size_t np 
void hfi1_release_user_pages(struct mm_struct *mm, struct page **p,

			     size_t npages, bool dirty)

{

	put_user_pages_dirty_lock(p, npages, dirty);

	unpin_user_pages_dirty_lock(p, npages, dirty);



	if (mm) { /* during close after signal, mm can be NULL */

		atomic64_sub(npages, &mm->pinned_vm);