Commit 2d15eb31 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

mm/gup: add make_dirty arg to put_user_pages_dirty_lock() 

[11~From: John Hubbard <jhubbard@nvidia.com>
Subject: mm/gup: add make_dirty arg to put_user_pages_dirty_lock()

Patch series "mm/gup: add make_dirty arg to put_user_pages_dirty_lock()",
v3.

There are about 50+ patches in my tree [2], and I'll be sending out the
remaining ones in a few more groups:

* The block/bio related changes (Jerome mostly wrote those, but I've had
  to move stuff around extensively, and add a little code)

* mm/ changes

* other subsystem patches

* an RFC that shows the current state of the tracking patch set.  That
  can only be applied after all call sites are converted, but it's good to
  get an early look at it.

This is part a tree-wide conversion, as described in fc1d8e7c ("mm:
introduce put_user_page*(), placeholder versions").

This patch (of 3):

Provide more capable variation of put_user_pages_dirty_lock(), and delete
put_user_pages_dirty().  This is based on the following:

1.  Lots of call sites become simpler if a bool is passed into
   put_user_page*(), instead of making the call site choose which
   put_user_page*() variant to call.

2.  Christoph Hellwig's observation that set_page_dirty_lock() is
   usually correct, and set_page_dirty() is usually a bug, or at least
   questionable, within a put_user_page*() calling chain.

This leads to the following API choices:

    * put_user_pages_dirty_lock(page, npages, make_dirty)

    * There is no put_user_pages_dirty(). You have to
      hand code that, in the rare case that it's
      required.

[jhubbard@nvidia.com: remove unused variable in siw_free_plist()]
  Link: http://lkml.kernel.org/r/20190729074306.10368-1-jhubbard@nvidia.com
Link: http://lkml.kernel.org/r/20190724044537.10458-2-jhubbard@nvidia.com


Signed-off-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Jan Kara <jack@suse.cz>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1ba6fc9a

drivers/infiniband/core/umem.c

+1 −4
Original line number Diff line number Diff line
@@ -54,10 +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);

		if (umem->writable && dirty)

			put_user_pages_dirty_lock(&page, 1);

		else

			put_user_page(page);

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

	}



	sg_free_table(&umem->sg_head);

drivers/infiniband/hw/hfi1/user_pages.c

+1 −4
Original line number Diff line number Diff line
@@ -118,10 +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)

{

	if (dirty)

		put_user_pages_dirty_lock(p, npages);

	else

		put_user_pages(p, npages);

	put_user_pages_dirty_lock(p, npages, dirty);



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

		atomic64_sub(npages, &mm->pinned_vm);

drivers/infiniband/hw/qib/qib_user_pages.c

+1 −4
Original line number Diff line number Diff line
@@ -40,10 +40,7 @@ 
static void __qib_release_user_pages(struct page **p, size_t num_pages,

				     int dirty)

{

	if (dirty)

		put_user_pages_dirty_lock(p, num_pages);

	else

		put_user_pages(p, num_pages);

	put_user_pages_dirty_lock(p, num_pages, dirty);

}



/**

drivers/infiniband/hw/usnic/usnic_uiom.c

+1 −4
Original line number Diff line number Diff line
@@ -75,10 +75,7 @@ static void usnic_uiom_put_pages(struct list_head *chunk_list, int dirty) 
		for_each_sg(chunk->page_list, sg, chunk->nents, i) {

			page = sg_page(sg);

			pa = sg_phys(sg);

			if (dirty)

				put_user_pages_dirty_lock(&page, 1);

			else

				put_user_page(page);

			put_user_pages_dirty_lock(&page, 1, dirty);

			usnic_dbg("pa: %pa\n", &pa);

		}

		kfree(chunk);

drivers/infiniband/sw/siw/siw_mem.c

+1 −9
Original line number Diff line number Diff line
@@ -63,15 +63,7 @@ struct siw_mem *siw_mem_id2obj(struct siw_device *sdev, int stag_index) 
static void siw_free_plist(struct siw_page_chunk *chunk, int num_pages,

			   bool dirty)

{

	struct page **p = chunk->plist;



	while (num_pages--) {

		if (!PageDirty(*p) && dirty)

			put_user_pages_dirty_lock(p, 1);

		else

			put_user_page(*p);

		p++;

	}

	put_user_pages_dirty_lock(chunk->plist, num_pages, dirty);

}



void siw_umem_release(struct siw_umem *umem, bool dirty)