put_user_pages(): miscellaneous call sites
Subsystems (42)
v2 cover put_user_pages(): miscellaneous call sites
From: John Hubbard <[email protected]>
Changes since v1:
* 9 out of 34 patches have been reviewed or ack'd or changed:
* Picked up Keith's Reviewed-by for patch 26 (gup_benchmark).
* Picked up ACKs for patches 3, 10, 15, 16 (ceph, genwqe, staging/vc04_services, drivers/tee).
* Patch 6 (i915): adjusted drivers/gpu/drm/i915/gem/i915_gem_userptr.c to match the latest linux.git: the code has already been fixed in linux.git, as of the latest -rc, to do a set_page_dirty_lock(), instead of set_page_dirty(). So all that it needs now is a conversion to put_user_page(). I've done that in a way (avoiding the changed API call) that allows patch 6 to go up via either Andrew's -mm tree, or the drm tree, just in case. See that patch's comments for slightly more detail.
* Patch 20 (xen): applied Juergen's recommended fix, and speculatively (pending his approval) added his Signed-off-by (also noted in the patch comments).
* Improved patch 31 (NFS) as recommended by Calum Mackay.
* Includes the latest version of patch 1. (Patch 1 has been separately reposted [3], with those updates. And it's included here in order to make this series apply directly to linux.git, as noted in the original cover letter below.)
Cover letter from v1:
These are best characterized as miscellaneous conversions: many (not all) call sites that don't involve biovec or iov_iter, nor mm/. It also leaves out a few call sites that require some more work. These are mostly pretty simple ones.
It's probably best to send all of these via Andrew's -mm tree, assuming that there are no significant merge conflicts with ongoing work in other trees (which I doubt, given that these are small changes).
These patches apply to the latest linux.git. Patch #1 is also already in Andrew's tree, but given the broad non-linux-mm Cc list, I thought it would be more convenient to just include that patch here, so that people can use linux.git as the base--even though these are probably destined for linux-mm.
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions"). That commit has an extensive description of the problem and the planned steps to solve it, but the highlites are:
1) Provide put_user_page*() routines, intended to be used for releasing pages that were pinned via get_user_pages*().
2) Convert all of the call sites for get_user_pages*(), to invoke put_user_page*(), instead of put_page(). This involves dozens of call sites, and will take some time.
3) After (2) is complete, use get_user_pages*() and put_user_page*() to implement tracking of these pages. This tracking will be separate from the existing struct page refcounting.
4) Use the tracking and identification of these pages, to implement special handling (especially in writeback paths) when the pages are backed by a filesystem.
And a few references, also from that commit:
[1] https://lwn.net/Articles/774411/ : "DMA and get_user_pages()"
[2] https://lwn.net/Articles/753027/ : "The Trouble with get_user_pages()"
[3] "mm/gup: add make_dirty arg to put_user_pages_dirty_lock()"
https://lore.kernel.org/r/[email protected]
Ira Weiny (1):
fs/binfmt_elf: convert put_page() to put_user_page*()
John Hubbard (33):
mm/gup: add make_dirty arg to put_user_pages_dirty_lock() net/rds: convert put_page() to put_user_page*() net/ceph: convert put_page() to put_user_page*() x86/kvm: convert put_page() to put_user_page*() drm/etnaviv: convert release_pages() to put_user_pages() drm/i915: convert put_page() to put_user_page*() drm/radeon: convert put_page() to put_user_page*() media/ivtv: convert put_page() to put_user_page*() media/v4l2-core/mm: convert put_page() to put_user_page*()
genwqe: convert put_page() to put_user_page*()
scif: convert put_page() to put_user_page*()
vmci: convert put_page() to put_user_page*()
rapidio: convert put_page() to put_user_page*()
oradax: convert put_page() to put_user_page*() staging/vc04_services: convert put_page() to put_user_page*() drivers/tee: convert put_page() to put_user_page*()
vfio: convert put_page() to put_user_page*() fbdev/pvr2fb: convert put_page() to put_user_page*()
fsl_hypervisor: convert put_page() to put_user_page*() fs/exec.c: convert put_page() to put_user_page*()
xen: convert put_page() to put_user_page*()
orangefs: convert put_page() to put_user_page*()
uprobes: convert put_page() to put_user_page*()
futex: convert put_page() to put_user_page*() mm/frame_vector.c: convert put_page() to put_user_page*() mm/gup_benchmark.c: convert put_page() to put_user_page*() mm/memory.c: convert put_page() to put_user_page*() mm/madvise.c: convert put_page() to put_user_page*() mm/process_vm_access.c: convert put_page() to put_user_page*()
crypt: convert put_page() to put_user_page*() fs/nfs: convert put_page() to put_user_page*()
goldfish_pipe: convert put_page() to put_user_page*() kernel/events/core.c: convert put_page() to put_user_page*()
arch/x86/kvm/svm.c | 4 +- crypto/af_alg.c | 7 +- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 6 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/infiniband/core/umem.c | 5 +- drivers/infiniband/hw/hfi1/user_pages.c | 5 +- drivers/infiniband/hw/qib/qib_user_pages.c | 13 +- drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- drivers/infiniband/sw/siw/siw_mem.c | 19 +-- drivers/media/pci/ivtv/ivtv-udma.c | 14 +-- drivers/media/pci/ivtv/ivtv-yuv.c | 11 +- drivers/media/v4l2-core/videobuf-dma-sg.c | 3 +- drivers/misc/genwqe/card_utils.c | 17 +-- drivers/misc/mic/scif/scif_rma.c | 17 ++- drivers/misc/vmw_vmci/vmci_context.c | 2 +- drivers/misc/vmw_vmci/vmci_queue_pair.c | 11 +- drivers/platform/goldfish/goldfish_pipe.c | 9 +- drivers/rapidio/devices/rio_mport_cdev.c | 9 +- drivers/sbus/char/oradax.c | 2 +- .../interface/vchiq_arm/vchiq_2835_arm.c | 10 +- drivers/tee/tee_shm.c | 10 +- drivers/vfio/vfio_iommu_type1.c | 8 +- drivers/video/fbdev/pvr2fb.c | 3 +- drivers/virt/fsl_hypervisor.c | 7 +- drivers/xen/privcmd.c | 32 ++--- fs/binfmt_elf.c | 2 +- fs/binfmt_elf_fdpic.c | 2 +- fs/exec.c | 2 +- fs/nfs/direct.c | 11 +- fs/orangefs/orangefs-bufmap.c | 7 +- include/linux/mm.h | 5 +- kernel/events/core.c | 2 +- kernel/events/uprobes.c | 6 +- kernel/futex.c | 10 +- mm/frame_vector.c | 4 +- mm/gup.c | 115 ++++++++---------- mm/gup_benchmark.c | 2 +- mm/madvise.c | 2 +- mm/memory.c | 2 +- mm/process_vm_access.c | 18 +-- net/ceph/pagevec.c | 8 +- net/rds/info.c | 5 +- net/rds/message.c | 2 +- net/rds/rdma.c | 15 ++- virt/kvm/kvm_main.c | 4 +- 46 files changed, 164 insertions(+), 295 deletions(-)
Signature · 1 line
2.22.0
PATCH v2 1/34 mm/gup: add make_dirty arg to put_user_pages_dirty_lock()
From: John Hubbard <[email protected]>
Provide a 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.
--- drivers/infiniband/core/umem.c | 5 +- drivers/infiniband/hw/hfi1/user_pages.c | 5 +- drivers/infiniband/hw/qib/qib_user_pages.c | 13 +-- drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- drivers/infiniband/sw/siw/siw_mem.c | 19 +--- include/linux/mm.h | 5 +- mm/gup.c | 115 +++++++++------------ 7 files changed, 61 insertions(+), 106 deletions(-)
drivers/infiniband/core/umem.c +1 -4
@@ -54,10 +54,7 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int dfor_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
@@ -118,10 +118,7 @@ int hfi1_acquire_user_pages(struct mm_struct *mm, unsigned long vaddr, size_t npvoid 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 +2 -11
@@ -37,15 +37,6 @@#include "qib.h" -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); -} -/** * qib_map_page - a safety wrapper around pci_map_page() *
@@ -124,7 +115,7 @@ int qib_get_user_pages(unsigned long start_page, size_t num_pages,return 0 ; bail_release: -__qib_release_user_pages (p, got,0 ); +put_user_pages_dirty_lock (p, got, false); bail:atomic64_sub (num_pages, ¤t->mm->pinned_vm);return ret;
@@ -132,7 +123,7 @@ int qib_get_user_pages(unsigned long start_page, size_t num_pages,void qib_release_user_pages (struct page **p,size_t num_pages) { -__qib_release_user_pages (p, num_pages,1 ); +put_user_pages_dirty_lock (p, num_pages, true);/* during close after signal, mm can be NULL */ if (current->mm)
drivers/infiniband/hw/usnic/usnic_uiom.c +1 -4
@@ -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 +3 -16
@@ -60,20 +60,6 @@ struct siw_mem *siw_mem_id2obj(struct siw_device *sdev, int stag_index)return NULL ; } -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++; - } -} -void siw_umem_release (struct siw_umem *umem,bool dirty) {struct mm_struct *mm_s = umem->owning_mm;
@@ -82,8 +68,9 @@ void siw_umem_release(struct siw_umem *umem, bool dirty)for (i =0 ; num_pages; i++) {int to_free =min_t (int,PAGES_PER_CHUNK , num_pages); -siw_free_plist (&umem->page_chunk[i], to_free, - umem->writable && dirty); +put_user_pages_dirty_lock (umem->page_chunk[i].plist, + to_free, + umem->writable && dirty);kfree (umem->page_chunk[i].plist); num_pages -= to_free; }
include/linux/mm.h +3 -2
@@ -1057,8 +1057,9 @@ static inline void put_user_page(struct page *page)put_page (page); } -void put_user_pages_dirty (struct page **pages,unsigned long npages); -void put_user_pages_dirty_lock (struct page **pages,unsigned long npages); +void put_user_pages_dirty_lock (struct page **pages,unsigned long npages, +bool make_dirty); +void put_user_pages (struct page **pages,unsigned long npages);#if defined(CONFIG_SPARSEMEM ) && !defined(CONFIG_SPARSEMEM_VMEMMAP )
mm/gup.c +50 -65
135 lines not on this page · raw message
Signature · 1 line
2.22.0
Re: [PATCH v2 01/34] mm/gup: add make_dirty arg to put_user_pages_dirty_lock()
Quoted 217 lines · On Sun, Aug 04, 2019 at 03:48:42PM -0700, [email protected] wrote:
From: John Hubbard <[email protected]>
Provide a more capable variation of
put_user_pages_dirty_lock(), and deleteput_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, andset_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.Reviewed-by Christoph Hellwig <[email protected]>Cc Matthew Wilcox <[email protected]>Cc Jan Kara <[email protected]>Cc Ira Weiny <[email protected]>Cc Jason Gunthorpe <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/infiniband/core/umem.c | 5 +- drivers/infiniband/hw/hfi1/user_pages.c | 5 +- drivers/infiniband/hw/qib/qib_user_pages.c | 13 +-- drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- drivers/infiniband/sw/siw/siw_mem.c | 19 +--- include/linux/mm.h | 5 +- mm/gup.c | 115 +++++++++------------ 7 files changed, 61 insertions(+), 106 deletions(-)drivers/infiniband/core/umem.c +1
-4@@ -54,10 +54,7 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int dfor_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@@ -118,10 +118,7 @@ int hfi1_acquire_user_pages(struct mm_struct *mm, unsigned long vaddr, size_t npvoid 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 +2
-11@@ -37,15 +37,6 @@#include "qib.h" -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); -} -/** * qib_map_page - a safety wrapper around pci_map_page() * @@ -124,7 +115,7 @@ int qib_get_user_pages(unsigned long start_page, size_t num_pages,return 0 ; bail_release: -__qib_release_user_pages (p, got,0 ); +put_user_pages_dirty_lock (p, got, false); bail:atomic64_sub (num_pages, ¤t->mm->pinned_vm);return ret;@@ -132,7 +123,7 @@ int qib_get_user_pages(unsigned long start_page, size_t num_pages,void qib_release_user_pages (struct page **p,size_t num_pages) { -__qib_release_user_pages (p, num_pages,1 ); +put_user_pages_dirty_lock (p, num_pages, true);/* during close after signal, mm can be NULL */ if (current->mm)drivers/infiniband/hw/usnic/usnic_uiom.c +1
-4@@ -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 +3
-16@@ -60,20 +60,6 @@ struct siw_mem *siw_mem_id2obj(struct siw_device *sdev, int stag_index)return NULL ; } -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++; - } -} -void siw_umem_release (struct siw_umem *umem,bool dirty) {struct mm_struct *mm_s = umem->owning_mm;@@ -82,8 +68,9 @@ void siw_umem_release(struct siw_umem *umem, bool dirty)for (i =0 ; num_pages; i++) {int to_free =min_t (int,PAGES_PER_CHUNK , num_pages); -siw_free_plist (&umem->page_chunk[i], to_free, - umem->writable && dirty); +put_user_pages_dirty_lock (umem->page_chunk[i].plist, + to_free, + umem->writable && dirty);kfree (umem->page_chunk[i].plist); num_pages -= to_free; }include/linux/mm.h +3
-2@@ -1057,8 +1057,9 @@ static inline void put_user_page(struct page *page)put_page (page); } -void put_user_pages_dirty (struct page **pages,unsigned long npages); -void put_user_pages_dirty_lock (struct page **pages,unsigned long npages); +void put_user_pages_dirty_lock (struct page **pages,unsigned long npages, +bool make_dirty); +void put_user_pages (struct page **pages,unsigned long npages);#if defined(CONFIG_SPARSEMEM ) && !defined(CONFIG_SPARSEMEM_VMEMMAP )mm/gup.c +0
-31@@ -29,85 +29,70 @@ struct follow_page_context {unsigned int page_mask; }; -typedef int (*set_dirty_func_t )(struct page *page); - -static void __put_user_pages_dirty (struct page **pages, -unsigned long npages, -set_dirty_func_t sdf) -{ -unsigned long index; - -for (index =0 ; index < npages; index++) { -struct page *page =compound_head (pages[index]); - -/* -* Checking PageDirty at this point may race with -* clear_page_dirty_for_io(), but that's OK. Two key cases: -* -* 1) This code sees the page as already dirty, so it skips -* the call to sdf(). That could happen because -* clear_page_dirty_for_io() called page_mkclean(), -* followed by set_page_dirty(). However, now the page is -* going to get written back, which meets the original -* intention of setting it dirty, so all is well: -* clear_page_dirty_for_io() goes on to call -* TestClearPageDirty(), and write the page back. -* -* 2) This code sees the page as clean, so it calls sdf(). -* The page stays dirty, despite being written back, so it -* gets written back again in the next writeback cycle. -* This is harmless. -*/ -if (!PageDirty (page)) -sdf (page);
mm/gup.c struct follow_page_context { · line 34
Quoted 10 lines
mm/gup.c +2
-7- -put_user_page (page); - } -} -/** -* put_user_pages_dirty() - release and dirty an array of gup-pinned pages -* @pages: array of pages to be marked dirty and released. +* put_user_pages_dirty_lock() - release and optionally dirty gup-pinned pages +* @pages: array of pages to be maybe marked dirty, and definitely released.
Better would be.
@pages: array of pages to be put
mm/gup.c struct follow_page_context { · line 44
Quoted 12 lines
mm/gup.c +4
-2* @npages: number of pages in the @pages array. +* @make_dirty: whether to mark the pages dirty * * "gup-pinned page" refers to a page that has had one of the get_user_pages() * variants called on that page. * * For each page in the @pages array, make that page (or its head page, if a -* compound page) dirty, if it was previously listed as clean. Then, release -* the page using put_user_page(). +* compound page) dirty, if @make_dirty is true, and if the page was previously +* listed as clean. In any case, releases all pages using put_user_page(), +* possibly via put_user_pages(), for the non-dirty case.
I don't think users of this interface need this level of detail. I think something like.
* For each page in the @pages array, release the page. If @make_dirty is
* true, mark the page dirty prior to release.
Quoted 34 lines
mm/gup.c +7
-20* * Please see the put_user_page() documentation for details. * -* set_page_dirty(), which does not lock the page, is used here. -* Therefore, it is the caller's responsibility to ensure that this is -* safe. If not, then put_user_pages_dirty_lock() should be called instead. +* set_page_dirty_lock() is used internally. If instead, set_page_dirty() is +* required, then the caller should a) verify that this is really correct, +* because _lock() is usually required, and b) hand code it: +* set_page_dirty_lock(), put_user_page(). * */ -void put_user_pages_dirty (struct page **pages,unsigned long npages) +void put_user_pages_dirty_lock (struct page **pages,unsigned long npages, +bool make_dirty) { -__put_user_pages_dirty (pages, npages, set_page_dirty); -} -EXPORT_SYMBOL (put_user_pages_dirty); +unsigned long index; -/** -* put_user_pages_dirty_lock() - release and dirty an array of gup-pinned pages -* @pages: array of pages to be marked dirty and released. -* @npages: number of pages in the @pages array. -* -* For each page in the @pages array, make that page (or its head page, if a -* compound page) dirty, if it was previously listed as clean. Then, release -* the page using put_user_page(). -* -* Please see the put_user_page() documentation for details. -* -* This is just like put_user_pages_dirty(), except that it invokes -* set_page_dirty_lock(), instead of set_page_dirty().
mm/gup.c struct follow_page_context { · line 63
Quoted 10 lines
mm/gup.c +5
-5-* -*/ -void put_user_pages_dirty_lock (struct page **pages,unsigned long npages) -{ -__put_user_pages_dirty (pages, npages, set_page_dirty_lock); +/* +* TODO: this can be optimized for huge pages: if a series of pages is +* physically contiguous and part of the same compound page, then a +* single operation to the head page should suffice. +*/
I think this comment belongs to the for loop below... or just something about how to make this and put_user_pages() more efficient. It is odd, that this is the same comment as in put_user_pages()...
The code is good. So... Other than the comments.
Ira
Quoted 38 lines
mm/gup.c +32
-0+ +if (!make_dirty) { +put_user_pages (pages, npages); +return ; + } + +for (index =0 ; index < npages; index++) { +struct page *page =compound_head (pages[index]); +/* +* Checking PageDirty at this point may race with +* clear_page_dirty_for_io(), but that's OK. Two key +* cases: +* +* 1) This code sees the page as already dirty, so it +* skips the call to set_page_dirty(). That could happen +* because clear_page_dirty_for_io() called +* page_mkclean(), followed by set_page_dirty(). +* However, now the page is going to get written back, +* which meets the original intention of setting it +* dirty, so all is well: clear_page_dirty_for_io() goes +* on to call TestClearPageDirty(), and write the page +* back. +* +* 2) This code sees the page as clean, so it calls +* set_page_dirty(). The page stays dirty, despite being +* written back, so it gets written back again in the +* next writeback cycle. This is harmless. +*/ +if (!PageDirty (page)) +set_page_dirty_lock (page); +put_user_page (page); + } }EXPORT_SYMBOL (put_user_pages_dirty_lock);Signature · 1 line
2.22.0
John Hubbard
reviewerRe: [PATCH v2 01/34] mm/gup: add make_dirty arg to put_user_pages_dirty_lock()
Quoted 2 lines · Ira Weiny
Quoted 1 line · On Sun, Aug 04, 2019 at 03:48:42PM -0700, [email protected] wrote:
From: John Hubbard <[email protected]>
...
Quoted 10 lines
Quoted 6 lines
-
/**
- *put_user_pages_dirty()- release and dirty an array of gup-pinned pages
- * @pages: array of pages to be marked dirty and released.
+ *put_user_pages_dirty_lock()- release and optionally dirty gup-pinned pages
+ * @pages: array of pages to be maybe marked dirty, and definitely released.Better would be.
@pages: array of pages to be put
OK, I'll change to that wording.
Quoted 14 lines
Quoted 13 lines
* @npages: number of pages in the @pages array.
+ * @make_dirty: whether to mark the pages dirty
*
* "gup-pinned page" refers to a page that has had one of theget_user_pages()
* variants called on that page.
*
* For each page in the @pages array, make that page (or its head page, if a
- * compound page) dirty, if it was previously listed as clean. Then, release
- * the page usingput_user_page().
+ * compound page) dirty, if @make_dirty is true, and if the page was previously
+ * listed as clean. In any case, releases all pages usingput_user_page(),
+ * possibly viaput_user_pages(), for the non-dirty case.
Quoted 5 lines
I don't think users of this interface need this level of detail. I think something like.
* For each page in the @pages array, release the page. If @make_dirty is
* true, mark the page dirty prior to release.
Yes, it is too wordy, I'll change to that.
Quoted 1 line
...
Quoted 4 lines
Quoted 4 lines
mm/gup.c +1
-3-void put_user_pages_dirty_lock (struct page **pages,unsigned long npages) -{ -__put_user_pages_dirty (pages, npages, set_page_dirty_lock); +/*
Quoted 8 lines
mm/gup.c struct follow_page_context { · line 63
Quoted 4 lines
mm/gup.c +4
-0+* TODO: this can be optimized for huge pages: if a series of pages is +* physically contiguous and part of the same compound page, then a +* single operation to the head page should suffice. +*/ I think this comment belongs to the for loop below... or just something about how to make this and
put_user_pages()more efficient. It is odd, that this is the same comment as input_user_pages()...
Actually I think I'll just delete the comment entirely, it's just noise really.
Quoted 4 lines
The code is good. So... Other than the comments.
Reviewed-by Ira Weiny <[email protected]>
Thanks for the review!
thanks,
Signature · 2 lines
John Hubbard NVIDIA
PATCH v2 2/34 net/rds: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- net/rds/info.c | 5 ++--- net/rds/message.c | 2 +- net/rds/rdma.c | 15 +++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-)
net/rds/info.c +2 -3
@@ -162,7 +162,6 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval,struct rds_info_lengths lens;unsigned long nr_pages =0 ;unsigned long start; -unsigned long i;rds_info_func func;struct page **pages =NULL ;int ret;
@@ -235,8 +234,8 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval, ret = -EFAULT ; out: -for (i =0 ; pages && i < nr_pages; i++) -put_page (pages[i]); +if (pages) +put_user_pages (pages, nr_pages);kfree (pages);return ret;
net/rds/message.c +1 -1
@@ -404,7 +404,7 @@ static int rds_message_zcopy_from_user(struct rds_message *rm, struct iov_iter *int i;for (i =0 ; i < rm->data.op_nents; i++) -put_page (sg_page (&rm->data.op_sg[i])); +put_user_page (sg_page (&rm->data.op_sg[i])); mmp = &rm->data.op_mmp_znotifier->z_mmp;mm_unaccount_pinned_pages (mmp); ret = -EFAULT ;
net/rds/rdma.c +7 -8
@@ -162,8 +162,7 @@ static int rds_pin_pages(unsigned long user_addr, unsigned int nr_pages, pages);if (ret >=0 && ret < nr_pages) { -while (ret--) -put_page (pages[ret]); +put_user_pages (pages, ret); ret = -EFAULT ; }
@@ -276,7 +275,7 @@ static int __rds_rdma_map(struct rds_sock *rs, struct rds_get_mr_args *args,if (IS_ERR (trans_private)) {for (i =0 ; i < nents; i++) -put_page (sg_page (&sg[i])); +put_user_page (sg_page (&sg[i]));kfree (sg); ret =PTR_ERR (trans_private); goto out;
@@ -464,9 +463,10 @@ void rds_rdma_free_op(struct rm_rdma_op *ro)* to local memory */ if (!ro->op_write) {WARN_ON (!page->mapping &&irqs_disabled ()); -set_page_dirty (page); +put_user_pages_dirty_lock (&page,1 , true); + }else { +put_user_page (page); } -put_page (page); }kfree (ro->op_notifier);
@@ -481,8 +481,7 @@ void rds_atomic_free_op(struct rm_atomic_op *ao)/* Mark page dirty if it was possibly modified, which * is the case for a RDMA_READ which copies from remote * to local memory */ -set_page_dirty (page); -put_page (page); +put_user_pages_dirty_lock (&page,1 , true);kfree (ao->op_notifier); ao->op_notifier =NULL ;
@@ -867,7 +866,7 @@ int rds_cmsg_atomic(struct rds_sock *rs, struct rds_message *rm,return ret; err:if (page) -put_page (page); +put_user_page (page); rm->atomic.op_active =0 ;kfree (rm->atomic.op_notifier);
Signature · 1 line
2.22.0
PATCH v2 3/34 net/ceph: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- net/ceph/pagevec.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
net/ceph/pagevec.c +1 -7
@@ -12,13 +12,7 @@void ceph_put_page_vector (struct page **pages,int num_pages,bool dirty) { -int i; - -for (i =0 ; i < num_pages; i++) { -if (dirty) -set_page_dirty_lock (pages[i]); -put_page (pages[i]); - } +put_user_pages_dirty_lock (pages, num_pages, dirty);kvfree (pages); }EXPORT_SYMBOL (ceph_put_page_vector);
Signature · 1 line
2.22.0
PATCH v2 4/34 x86/kvm: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- arch/x86/kvm/svm.c | 4 ++-- virt/kvm/kvm_main.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/kvm/svm.c +2 -2
@@ -1827,7 +1827,7 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr, err:if (npinned >0 ) -release_pages (pages, npinned); +put_user_pages (pages, npinned);kvfree (pages);return NULL ;
@@ -1838,7 +1838,7 @@ static void sev_unpin_memory(struct kvm *kvm, struct page **pages, {struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; -release_pages (pages, npages); +put_user_pages (pages, npages);kvfree (pages); sev->pages_locked -= npages; }
virt/kvm/kvm_main.c +2 -2
@@ -1499,7 +1499,7 @@ static int hva_to_pfn_slow(unsigned long addr, bool *async, bool write_fault,if (__get_user_pages_fast (addr,1 ,1 , &wpage) ==1 ) { *writable = true; -put_page (page); +put_user_page (page); page = wpage; } }
@@ -1831,7 +1831,7 @@ EXPORT_SYMBOL_GPL(kvm_release_page_clean);void kvm_release_pfn_clean (kvm_pfn_t pfn) {if (!is_error_noslot_pfn (pfn) && !kvm_is_reserved_pfn (pfn)) -put_page (pfn_to_page (pfn)); +put_user_page (pfn_to_page (pfn)); }EXPORT_SYMBOL_GPL (kvm_release_pfn_clean);
Signature · 6 lines
2.22.0 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH v2 5/34 drm/etnaviv: convert release_pages() to put_user_pages()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gem.c +2 -2
@@ -686,7 +686,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj) ret =get_user_pages_fast (ptr, num_pages, !userptr->ro ?FOLL_WRITE :0 , pages);if (ret <0 ) { -release_pages (pvec, pinned); +put_user_pages (pvec, pinned);kvfree (pvec);return ret; }
@@ -710,7 +710,7 @@ static void etnaviv_gem_userptr_release(struct etnaviv_gem_object *etnaviv_obj)if (etnaviv_obj->pages) {int npages = etnaviv_obj->base.size >>PAGE_SHIFT ; -release_pages (etnaviv_obj->pages, npages); +put_user_pages (etnaviv_obj->pages, npages);kvfree (etnaviv_obj->pages); } }
Signature · 1 line
2.22.0
PATCH v2 6/34 drm/i915: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
This is a merge-able version of the fix, because it restricts itself to put_user_page() and put_user_pages(), both of which have not changed their APIs. Later, i915_gem_userptr_put_pages() can be simplified to use put_user_pages_dirty_lock().
--- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_userptr.c +3 -3
@@ -527,7 +527,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work) }mutex_unlock (&obj->mm.lock); -release_pages (pvec, pinned); +put_user_pages (pvec, pinned);kvfree (pvec);i915_gem_object_put (obj);
@@ -640,7 +640,7 @@ static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)__i915_gem_userptr_set_active (obj, true);if (IS_ERR (pages)) -release_pages (pvec, pinned); +put_user_pages (pvec, pinned);kvfree (pvec);return PTR_ERR_OR_ZERO (pages);
@@ -675,7 +675,7 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj,set_page_dirty_lock (page);mark_page_accessed (page); -put_page (page); +put_user_page (page); } obj->mm.dirty = false;
Signature · 1 line
2.22.0
Rodrigo Vivi
maintainerRe: [PATCH v2 06/34] drm/i915: convert put_page() to put_user_page*()
Quoted 6 lines · On Sun, Aug 04, 2019 at 03:48:47PM -0700, [email protected] wrote:
From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via
put_page()orrelease_pages().
Quoted 7 lines
This is part a tree-wide conversion, as described in commit
fc1d8e7cca2d("mm: introduce put_user_page*(), placeholder versions").This is a merge-able version of the fix, because it restricts itself to
put_user_page()andput_user_pages(), both of which have not changed their APIs. Later,i915_gem_userptr_put_pages()can be simplified to useput_user_pages_dirty_lock().
Thanks for that.
with this version we won't have any conflict.
Ack for going through mm tree.
Quoted 50 lines
Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc David Airlie <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_userptr.c +3
-3@@ -527,7 +527,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work) }mutex_unlock (&obj->mm.lock); -release_pages (pvec, pinned); +put_user_pages (pvec, pinned);kvfree (pvec);i915_gem_object_put (obj);@@ -640,7 +640,7 @@ static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)__i915_gem_userptr_set_active (obj, true);if (IS_ERR (pages)) -release_pages (pvec, pinned); +put_user_pages (pvec, pinned);kvfree (pvec);return PTR_ERR_OR_ZERO (pages);@@ -675,7 +675,7 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj,set_page_dirty_lock (page);mark_page_accessed (page); -put_page (page); +put_user_page (page); } obj->mm.dirty = false;Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 7/34 drm/radeon: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_ttm.c +1 -1
@@ -540,7 +540,7 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_tt *ttm)kfree (ttm->sg); release_pages: -release_pages (ttm->pages, pinned); +put_user_pages (ttm->pages, pinned);return r; }
Signature · 6 lines
2.22.0 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH v2 8/34 media/ivtv: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- drivers/media/pci/ivtv/ivtv-udma.c | 14 ++++---------- drivers/media/pci/ivtv/ivtv-yuv.c | 11 +++-------- 2 files changed, 7 insertions(+), 18 deletions(-)
drivers/media/pci/ivtv/ivtv-udma.c +4 -10
@@ -92,7 +92,7 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr, {struct ivtv_dma_page_info user_dma;struct ivtv_user_dma *dma = &itv->udma; -int i, err; +int err;IVTV_DEBUG_DMA ("ivtv_udma_setup, dst: 0x%08x\n" , (unsigned int )ivtv_dest_addr);
@@ -119,8 +119,7 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr,IVTV_DEBUG_WARN ("failed to map user pages, returned %d instead of %d\n" , err, user_dma.page_count);if (err >=0 ) { -for (i =0 ; i < err; i++) -put_page (dma->map[i]); +put_user_pages (dma->map, err);return -EINVAL ; }return err;
@@ -130,9 +129,7 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr,/* Fill SG List with new values */ if (ivtv_udma_fill_sg_list (dma, &user_dma,0 ) <0 ) { -for (i =0 ; i < dma->page_count; i++) { -put_page (dma->map[i]); - } +put_user_pages (dma->map, dma->page_count); dma->page_count =0 ;return -ENOMEM ; }
@@ -153,7 +150,6 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr,void ivtv_udma_unmap (struct ivtv *itv) {struct ivtv_user_dma *dma = &itv->udma; -int i;IVTV_DEBUG_INFO ("ivtv_unmap_user_dma\n" );
@@ -170,9 +166,7 @@ void ivtv_udma_unmap(struct ivtv *itv)ivtv_udma_sync_for_cpu (itv);/* Release User Pages */ -for (i =0 ; i < dma->page_count; i++) { -put_page (dma->map[i]); - } +put_user_pages (dma->map, dma->page_count); dma->page_count =0 ; }
drivers/media/pci/ivtv/ivtv-yuv.c +3 -8
@@ -30,7 +30,6 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma,struct yuv_playback_info *yi = &itv->yuv_info;u8 frame = yi->draw_frame;struct yuv_frame_info *f = &yi->new_frame_info[frame]; -int i;int y_pages, uv_pages;unsigned long y_buffer_offset, uv_buffer_offset;int y_decode_height, uv_decode_height, y_size;
@@ -81,8 +80,7 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma, uv_pages, uv_dma.page_count);if (uv_pages >=0 ) { -for (i =0 ; i < uv_pages; i++) -put_page (dma->map[y_pages + i]); +put_user_pages (&dma->map[y_pages], uv_pages); rc = -EFAULT ; }else { rc = uv_pages;
@@ -93,8 +91,7 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma, y_pages, y_dma.page_count); }if (y_pages >=0 ) { -for (i =0 ; i < y_pages; i++) -put_page (dma->map[i]); +put_user_pages (dma->map, y_pages);/* * Inherit the -EFAULT from rc's * initialization, but allow it to be
@@ -112,9 +109,7 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma,/* Fill & map SG List */ if (ivtv_udma_fill_sg_list (dma, &uv_dma,ivtv_udma_fill_sg_list (dma, &y_dma,0 )) <0 ) {IVTV_DEBUG_WARN ("could not allocate bounce buffers for highmem userspace buffers\n" ); -for (i =0 ; i < dma->page_count; i++) { -put_page (dma->map[i]); - } +put_user_pages (dma->map, dma->page_count); dma->page_count =0 ;return -ENOMEM ; }
Signature · 1 line
2.22.0
PATCH v2 9/34 media/v4l2-core/mm: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- drivers/media/v4l2-core/videobuf-dma-sg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/v4l2-core/videobuf-dma-sg.c +1 -2
@@ -349,8 +349,7 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma)BUG_ON (dma->sglen);if (dma->pages) { -for (i =0 ; i < dma->nr_pages; i++) -put_page (dma->pages[i]); +put_user_pages (dma->pages, dma->nr_pages);kfree (dma->pages); dma->pages =NULL ; }
Signature · 1 line
2.22.0
PATCH v2 10/34 genwqe: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
This changes the release code slightly, because each page slot in the page_list[] array is no longer checked for NULL. However, that check was wrong anyway, because the get_user_pages() pattern of usage here never allowed for NULL entries within a range of pinned pages.
--- drivers/misc/genwqe/card_utils.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/misc/genwqe/card_utils.c +3 -14
@@ -517,24 +517,13 @@ int genwqe_free_sync_sgl(struct genwqe_dev *cd, struct genwqe_sgl *sgl)/** * genwqe_free_user_pages() - Give pinned pages back * -* Documentation of get_user_pages is in mm/gup.c: -* -* If the page is written to, set_page_dirty (or set_page_dirty_lock, -* as appropriate) must be called after the page is finished with, and -* before put_page is called. +* The pages may have been written to, so we call put_user_pages_dirty_lock(), +* rather than put_user_pages(). */ static int genwqe_free_user_pages (struct page **page_list,unsigned int nr_pages,int dirty) { -unsigned int i; - -for (i =0 ; i < nr_pages; i++) { -if (page_list[i] !=NULL ) { -if (dirty) -set_page_dirty_lock (page_list[i]); -put_page (page_list[i]); - } - } +put_user_pages_dirty_lock (page_list, nr_pages, dirty);return 0 ; }
Signature · 1 line
2.22.0
PATCH v2 11/34 scif: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- drivers/misc/mic/scif/scif_rma.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/misc/mic/scif/scif_rma.c +8 -9
@@ -113,13 +113,14 @@ static int scif_destroy_pinned_pages(struct scif_pinned_pages *pin)int writeable = pin->prot &SCIF_PROT_WRITE ;int kernel =SCIF_MAP_KERNEL & pin->map_flags; -for (j =0 ; j < pin->nr_pages; j++) { -if (pin->pages[j] && !kernel) { +if (kernel) { +for (j =0 ; j < pin->nr_pages; j++) {if (writeable) -SetPageDirty (pin->pages[j]); +set_page_dirty_lock (pin->pages[j]);put_page (pin->pages[j]); } - } + }else +put_user_pages_dirty_lock (pin->pages, pin->nr_pages, writeable);scif_free (pin->pages, pin->nr_pages *sizeof (*pin->pages));
@@ -1385,11 +1386,9 @@ int __scif_pin_pages(void *addr, size_t len, int *out_prot,if (ulimit)__scif_dec_pinned_vm_lock (mm, nr_pages);/* Roll back any pinned pages */ -for (i =0 ; i < pinned_pages->nr_pages; i++) { -if (pinned_pages->pages[i]) -put_page ( - pinned_pages->pages[i]); - } +put_user_pages (pinned_pages->pages, + pinned_pages->nr_pages); + prot &= ~SCIF_PROT_WRITE ; try_upgrade = false; goto retry;
Signature · 1 line
2.22.0
PATCH v2 12/34 vmci: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
Note that this effectively changes the code's behavior in qp_release_pages(): it now ultimately calls set_page_dirty_lock(), instead of set_page_dirty(). This is probably more accurate.
As Christoph Hellwig put it, "set_page_dirty() is only safe if we are dealing with a file backed page where we have reference on the inode it hangs off." [1]
[1] https://lore.kernel.org/r/[email protected]
--- drivers/misc/vmw_vmci/vmci_context.c | 2 +- drivers/misc/vmw_vmci/vmci_queue_pair.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-)
drivers/misc/vmw_vmci/vmci_context.c +1 -1
@@ -587,7 +587,7 @@ void vmci_ctx_unset_notify(struct vmci_ctx *context)if (notify_page) {kunmap (notify_page); -put_page (notify_page); +put_user_page (notify_page); } }
drivers/misc/vmw_vmci/vmci_queue_pair.c +2 -9
@@ -626,15 +626,8 @@ static void qp_release_queue_mutex(struct vmci_queue *queue)static void qp_release_pages (struct page **pages,u64 num_pages,bool dirty) { -int i; - -for (i =0 ; i < num_pages; i++) { -if (dirty) -set_page_dirty (pages[i]); - -put_page (pages[i]); - pages[i] =NULL ; - } +put_user_pages_dirty_lock (pages, num_pages, dirty); +memset (pages,0 , num_pages *sizeof (struct page *)); }/*
Signature · 1 line
2.22.0
PATCH v2 13/34 rapidio: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- drivers/rapidio/devices/rio_mport_cdev.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/rapidio/devices/rio_mport_cdev.c +3 -6
@@ -572,14 +572,12 @@ static void dma_req_free(struct kref *ref) struct mport_dma_req *req = container_of(ref, struct mport_dma_req, refcount);struct mport_cdev_priv *priv = req->priv; -unsigned int i;dma_unmap_sg (req->dmach->device->dev, req->sgt.sgl, req->sgt.nents, req->dir);sg_free_table (&req->sgt);if (req->page_list) { -for (i =0 ; i < req->nr_pages; i++) -put_page (req->page_list[i]); +put_user_pages (req->page_list, req->nr_pages);kfree (req->page_list); }
@@ -815,7 +813,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,struct mport_dma_req *req;struct mport_dev *md = priv->md;struct dma_chan *chan; -int i, ret; +int ret;int nents;if (xfer->length ==0 )
@@ -946,8 +944,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, err_pg:if (!req->page_list) { -for (i =0 ; i < nr_pages; i++) -put_page (page_list[i]); +put_user_pages (page_list, nr_pages);kfree (page_list); } err_req:
Signature · 1 line
2.22.0
PATCH v2 14/34 oradax: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- drivers/sbus/char/oradax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/sbus/char/oradax.c +1 -1
@@ -412,7 +412,7 @@ static void dax_unlock_pages(struct dax_ctx *ctx, int ccb_index, int nelem)dax_dbg ("freeing page %p" , p);if (j ==OUT )set_page_dirty (p); -put_page (p); +put_user_page (p); ctx->pages[i][j] =NULL ; } }
Signature · 1 line
2.22.0
PATCH v2 15/34 staging/vc04_services: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- .../vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +2 -8
@@ -336,10 +336,7 @@ cleanup_pagelistinfo(struct vchiq_pagelist_info *pagelistinfo) }if (pagelistinfo->pages_need_release) { -unsigned int i; - -for (i =0 ; i < pagelistinfo->num_pages; i++) -put_page (pagelistinfo->pages[i]); +put_user_pages (pagelistinfo->pages, pagelistinfo->num_pages); } dma_free_coherent(g_dev, pagelistinfo->pagelist_buffer_size,
@@ -454,10 +451,7 @@ create_pagelist(char __user *buf, size_t count, unsigned short type) __func__, actual_pages, num_pages);/* This is probably due to the process being killed */ -while (actual_pages >0 ) { - actual_pages--; -put_page (pages[actual_pages]); - } +put_user_pages (pages, actual_pages);cleanup_pagelistinfo (pagelistinfo);return NULL ; }
Signature · 1 line
2.22.0
Re: [PATCH v2 15/34] staging/vc04_services: convert put_page() to put_user_page*()
Quoted 11 lines · On 05.08.19 00:48, [email protected] wrote:
From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via
put_page()orrelease_pages().This is part a tree-wide conversion, as described in commit
fc1d8e7cca2d("mm: introduce put_user_page*(), placeholder versions").
Quoted 12 lines
Cc Eric Anholt <[email protected]>Cc Stefan Wahren <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Mihaela Muraru <[email protected]>Cc Suniel Mahesh <[email protected]>Cc Al Viro <[email protected]>Cc Sidong Yang <[email protected]>Cc Kishore KP <[email protected]>Signed-off-by John Hubbard <[email protected]>
PATCH v2 16/34 drivers/tee: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- drivers/tee/tee_shm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/tee/tee_shm.c +2 -8
@@ -31,16 +31,13 @@ static void tee_shm_release(struct tee_shm *shm) poolm->ops->free (poolm, shm); }else if (shm->flags &TEE_SHM_REGISTER ) { -size_t n;int rc = teedev->desc->ops->shm_unregister (shm->ctx, shm);if (rc)dev_err (teedev->dev.parent,"unregister shm %p failed: %d" , shm, rc); -for (n =0 ; n < shm->num_pages; n++) -put_page (shm->pages[n]); - +put_user_pages (shm->pages, shm->num_pages);kfree (shm->pages); }
@@ -313,16 +310,13 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,return shm; err:if (shm) { -size_t n; -if (shm->id >=0 ) {mutex_lock (&teedev->mutex);idr_remove (&teedev->idr, shm->id);mutex_unlock (&teedev->mutex); }if (shm->pages) { -for (n =0 ; n < shm->num_pages; n++) -put_page (shm->pages[n]); +put_user_pages (shm->pages, shm->num_pages);kfree (shm->pages); } }
Signature · 1 line
2.22.0
PATCH v2 17/34 vfio: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
Note that this effectively changes the code's behavior in qp_release_pages(): it now ultimately calls set_page_dirty_lock(), instead of set_page_dirty(). This is probably more accurate.
As Christoph Hellwig put it, "set_page_dirty() is only safe if we are dealing with a file backed page where we have reference on the inode it hangs off." [1]
[1] https://lore.kernel.org/r/[email protected]
--- drivers/vfio/vfio_iommu_type1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/vfio/vfio_iommu_type1.c +4 -4
@@ -320,9 +320,9 @@ static int put_pfn(unsigned long pfn, int prot) {if (!is_invalid_reserved_pfn (pfn)) {struct page *page =pfn_to_page (pfn); -if (prot &IOMMU_WRITE ) -SetPageDirty (page); -put_page (page); +bool dirty = prot &IOMMU_WRITE ; + +put_user_pages_dirty_lock (&page,1 , dirty);return 1 ; }return 0 ;
@@ -356,7 +356,7 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,*/ if (ret >0 &&vma_is_fsdax (vmas[0 ])) { ret = -EOPNOTSUPP ; -put_page (page[0 ]); +put_user_page (page[0 ]); } }up_read (&mm->mmap_sem);
Signature · 1 line
2.22.0
PATCH v2 18/34 fbdev/pvr2fb: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- drivers/video/fbdev/pvr2fb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/fbdev/pvr2fb.c +1 -2
@@ -700,8 +700,7 @@ static ssize_t pvr2fb_write(struct fb_info *info, const char *buf, ret = count; out_unmap: -for (i =0 ; i < nr_pages; i++) -put_page (pages[i]); +put_user_pages (pages, nr_pages);kfree (pages);
Signature · 1 line
2.22.0
PATCH v2 19/34 fsl_hypervisor: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
This changes the release code slightly, because each page slot in the page_list[] array is no longer checked for NULL. However, that check was wrong anyway, because the get_user_pages() pattern of usage here never allowed for NULL entries within a range of pinned pages.
--- drivers/virt/fsl_hypervisor.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/virt/fsl_hypervisor.c +2 -5
@@ -292,11 +292,8 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p) virt_to_phys(sg_list), num_pages); exit: -if (pages) { -for (i =0 ; i < num_pages; i++) -if (pages[i]) -put_page (pages[i]); - } +if (pages) +put_user_pages (pages, num_pages);kfree (sg_list_unaligned);kfree (pages);
Signature · 1 line
2.22.0
PATCH v2 20/34 xen: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
This also handles pages[i] == NULL cases, thanks to an approach that is actually written by Juergen Gross.
---
Hi Juergen,
Say, this is *exactly* what you proposed in your gup.patch, so I've speculatively added your Signed-off-by above, but need your approval before that's final. Let me know please...
thanks,
John Hubbard
drivers/xen/privcmd.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-)
drivers/xen/privcmd.c +11 -21
@@ -582,10 +582,11 @@ static long privcmd_ioctl_mmap_batch(static int lock_pages (struct privcmd_dm_op_buf kbufs[],unsigned int num, -struct page *pages[],unsigned int nr_pages) +struct page *pages[],unsigned int *nr_pages) { -unsigned int i; +unsigned int i, free = *nr_pages; + *nr_pages =0 ;for (i =0 ; i < num; i++) {unsigned int requested;int pinned;
@@ -593,35 +594,22 @@ static int lock_pages( requested =DIV_ROUND_UP (offset_in_page (kbufs[i].uptr) + kbufs[i].size,PAGE_SIZE ); -if (requested > nr_pages) +if (requested > free)return -ENOSPC ; pinned =get_user_pages_fast ( (unsigned long ) kbufs[i].uptr, - requested,FOLL_WRITE , pages); + requested,FOLL_WRITE , pages + *nr_pages);if (pinned <0 )return pinned; - nr_pages -= pinned; - pages += pinned; + free -= pinned; + *nr_pages += pinned; }return 0 ; } -static void unlock_pages (struct page *pages[],unsigned int nr_pages) -{ -unsigned int i; - -if (!pages) -return ; - -for (i =0 ; i < nr_pages; i++) { -if (pages[i]) -put_page (pages[i]); - } -} -static long privcmd_ioctl_dm_op (struct file *file,void __user *udata) {struct privcmd_data *data = file->private_data;
@@ -681,11 +669,12 @@ static long privcmd_ioctl_dm_op(struct file *file, void __user *udata) xbufs =kcalloc (kdata.num,sizeof (*xbufs),GFP_KERNEL );if (!xbufs) { + nr_pages =0 ; rc = -ENOMEM ; goto out; } - rc =lock_pages (kbufs, kdata.num, pages, nr_pages); + rc =lock_pages (kbufs, kdata.num, pages, &nr_pages);if (rc) goto out;
@@ -699,7 +688,8 @@ static long privcmd_ioctl_dm_op(struct file *file, void __user *udata)xen_preemptible_hcall_end (); out: -unlock_pages (pages, nr_pages); +if (pages) +put_user_pages (pages, nr_pages);kfree (xbufs);kfree (pages);kfree (kbufs);
Signature · 1 line
2.22.0
Juergen Gross
maintainerRe: [PATCH v2 20/34] xen: convert put_page() to put_user_page*()
Quoted 17 lines · On 05.08.19 00:49, [email protected] wrote:
From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via
put_page()orrelease_pages().This is part a tree-wide conversion, as described in commit
fc1d8e7cca2d("mm: introduce put_user_page*(), placeholder versions").This also handles pages[i] == NULL cases, thanks to an approach that is actually written by Juergen Gross.
Signed-off-by Juergen Gross <[email protected]>Signed-off-by John Hubbard <[email protected]>Cc Boris Ostrovsky <[email protected]>
Quoted 7 lines
---
Hi Juergen,
Say, this is *exactly* what you proposed in your gup.patch, so I've speculatively added your Signed-off-by above, but need your approval before that's final. Let me know please...
Yes, that's fine with me.
Juergen
PATCH v2 21/34 fs/exec.c: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- fs/exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/exec.c +1 -1
@@ -227,7 +227,7 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,static void put_arg_page (struct page *page) { -put_page (page); +put_user_page (page); }static void free_arg_pages (struct linux_binprm *bprm)
Signature · 1 line
2.22.0
PATCH v2 22/34 orangefs: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- fs/orangefs/orangefs-bufmap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
fs/orangefs/orangefs-bufmap.c +2 -5
@@ -168,10 +168,7 @@ static DEFINE_SPINLOCK(orangefs_bufmap_lock);static void orangefs_bufmap_unmap (struct orangefs_bufmap *bufmap) { -int i; - -for (i =0 ; i < bufmap->page_count; i++) -put_page (bufmap->page_array[i]); +put_user_pages (bufmap->page_array, bufmap->page_count); } static void
@@ -280,7 +277,7 @@ orangefs_bufmap_map(struct orangefs_bufmap *bufmap,for (i =0 ; i < ret; i++) {SetPageError (bufmap->page_array[i]); -put_page (bufmap->page_array[i]); +put_user_page (bufmap->page_array[i]); }return -ENOMEM ; }
Signature · 1 line
2.22.0
PATCH v2 23/34 uprobes: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- kernel/events/uprobes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/events/uprobes.c +3 -3
@@ -397,7 +397,7 @@ __update_ref_ctr(struct mm_struct *mm, unsigned long vaddr, short d) ret =0 ; out:kunmap_atomic (kaddr); -put_page (page); +put_user_page (page);return ret; }
@@ -504,7 +504,7 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, ret =__replace_page (vma, vaddr, old_page, new_page);put_page (new_page); put_old: -put_page (old_page); +put_user_page (old_page);if (unlikely (ret == -EAGAIN )) goto retry;
@@ -1981,7 +1981,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)return result;copy_from_page (page, vaddr, &opcode,UPROBE_SWBP_INSN_SIZE ); -put_page (page); +put_user_page (page); out:/* This needs to return true for any variant of the trap insn */ return is_trap_insn (&opcode);
Signature · 1 line
2.22.0
PATCH v2 24/34 futex: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- kernel/futex.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/futex.c +5 -5
@@ -623,7 +623,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_alock_page (page); shmem_swizzled =PageSwapCache (page) || page->mapping;unlock_page (page); -put_page (page); +put_user_page (page);if (shmem_swizzled) goto again;
@@ -675,7 +675,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_aif (READ_ONCE (page->mapping) != mapping) {rcu_read_unlock (); -put_page (page); +put_user_page (page); goto again; }
@@ -683,7 +683,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_a inode =READ_ONCE (mapping->host);if (!inode) {rcu_read_unlock (); -put_page (page); +put_user_page (page); goto again; }
@@ -702,7 +702,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_a*/ if (!atomic_inc_not_zero (&inode->i_count)) {rcu_read_unlock (); -put_page (page); +put_user_page (page); goto again; }
@@ -723,7 +723,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_a } out: -put_page (page); +put_user_page (page);return err; }
Signature · 1 line
2.22.0
PATCH v2 25/34 mm/frame_vector.c: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- mm/frame_vector.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
mm/frame_vector.c +1 -3
@@ -120,7 +120,6 @@ EXPORT_SYMBOL(get_vaddr_frames);*/ void put_vaddr_frames (struct frame_vector *vec) { -int i;struct page **pages;if (!vec->got_ref)
@@ -133,8 +132,7 @@ void put_vaddr_frames(struct frame_vector *vec)*/ if (WARN_ON (IS_ERR (pages))) goto out; -for (i =0 ; i < vec->nr_frames; i++) -put_page (pages[i]); +put_user_pages (pages, vec->nr_frames); vec->got_ref = false; out: vec->nr_frames =0 ;
Signature · 7 lines
2.22.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v2 26/34 mm/gup_benchmark.c: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- mm/gup_benchmark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/gup_benchmark.c +1 -1
@@ -79,7 +79,7 @@ static int __gup_benchmark_ioctl(unsigned int cmd,for (i =0 ; i < nr_pages; i++) {if (!pages[i])break ; -put_page (pages[i]); +put_user_page (pages[i]); } end_time =ktime_get (); gup->put_delta_usec =ktime_us_delta (end_time, start_time);
Signature · 7 lines
2.22.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v2 27/34 mm/memory.c: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- mm/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memory.c +1 -1
@@ -4337,7 +4337,7 @@ int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, buf, maddr + offset, bytes); }kunmap (page); -put_page (page); +put_user_page (page); } len -= bytes; buf += bytes;
Signature · 7 lines
2.22.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v2 28/34 mm/madvise.c: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- mm/madvise.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/madvise.c +1 -1
@@ -672,7 +672,7 @@ static int madvise_inject_error(int behavior,* routine is responsible for pinning the page to prevent it * from being released back to the page allocator. */ -put_page (page); +put_user_page (page); ret =memory_failure (pfn,0 );if (ret)return ret;
Signature · 7 lines
2.22.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v2 29/34 mm/process_vm_access.c: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- mm/process_vm_access.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
mm/process_vm_access.c +9 -9
@@ -96,7 +96,7 @@ static int process_vm_rw_single_vec(unsigned long addr, flags |=FOLL_WRITE ;while (!rc && nr_pages &&iov_iter_count (iter)) { -int pages =min (nr_pages, max_pages_per_loop); +int pinned_pages =min (nr_pages, max_pages_per_loop);int locked =1 ;size_t bytes;
@@ -106,14 +106,15 @@ static int process_vm_rw_single_vec(unsigned long addr,* current/current->mm */ down_read (&mm->mmap_sem); - pages =get_user_pages_remote (task, mm, pa, pages, flags, - process_pages,NULL , &locked); + pinned_pages =get_user_pages_remote (task, mm, pa, pinned_pages, + flags, process_pages,NULL , + &locked);if (locked)up_read (&mm->mmap_sem); -if (pages <=0 ) +if (pinned_pages <=0 )return -EFAULT ; - bytes = pages *PAGE_SIZE - start_offset; + bytes = pinned_pages *PAGE_SIZE - start_offset;if (bytes > len) bytes = len;
@@ -122,10 +123,9 @@ static int process_vm_rw_single_vec(unsigned long addr, vm_write); len -= bytes; start_offset =0 ; - nr_pages -= pages; - pa += pages *PAGE_SIZE ; -while (pages) -put_page (process_pages[--pages]); + nr_pages -= pinned_pages; + pa += pinned_pages *PAGE_SIZE ; +put_user_pages (process_pages, pinned_pages); }return rc;
Signature · 7 lines
2.22.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v2 30/34 crypt: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- crypto/af_alg.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
crypto/af_alg.c +2 -5
@@ -428,10 +428,7 @@ static void af_alg_link_sg(struct af_alg_sgl *sgl_prev,void af_alg_free_sg (struct af_alg_sgl *sgl) { -int i; - -for (i =0 ; i < sgl->npages; i++) -put_page (sgl->pages[i]); +put_user_pages (sgl->pages, sgl->npages); }EXPORT_SYMBOL_GPL (af_alg_free_sg);
@@ -668,7 +665,7 @@ static void af_alg_free_areq_sgls(struct af_alg_async_req *areq)for_each_sg (tsgl, sg, areq->tsgl_entries, i) {if (!sg_page (sg))continue ; -put_page (sg_page (sg)); +put_user_page (sg_page (sg)); }sock_kfree_s (sk, tsgl, areq->tsgl_entries *sizeof (*tsgl));
Signature · 7 lines
2.22.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v2 31/34 fs/nfs: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- fs/nfs/direct.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
fs/nfs/direct.c +2 -9
@@ -276,13 +276,6 @@ ssize_t nfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)return nfs_file_direct_write (iocb, iter); } -static void nfs_direct_release_pages (struct page **pages,unsigned int npages) -{ -unsigned int i; -for (i =0 ; i < npages; i++) -put_page (pages[i]); -} -void nfs_init_cinfo_from_dreq (struct nfs_commit_info *cinfo,struct nfs_direct_req *dreq) {
@@ -512,7 +505,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, pos += req_len; dreq->bytes_left -= req_len; } -nfs_direct_release_pages (pagevec, npages); +put_user_pages (pagevec, npages);kvfree (pagevec);if (result <0 )break ;
@@ -935,7 +928,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, pos += req_len; dreq->bytes_left -= req_len; } -nfs_direct_release_pages (pagevec, npages); +put_user_pages (pagevec, npages);kvfree (pagevec);if (result <0 )break ;
Signature · 1 line
2.22.0
Re: [PATCH v2 31/34] fs/nfs: convert put_page() to put_user_page*()
Quoted 9 lines · On 04/08/2019 11:49 pm, [email protected] wrote:
From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via
put_page()orrelease_pages().This is part a tree-wide conversion, as described in commit
fc1d8e7cca2d("mm: introduce put_user_page*(), placeholder versions").
Quoted 8 lines
Cc Calum Mackay <[email protected]>Cc Trond Myklebust <[email protected]>Cc Anna Schumaker <[email protected]>Signed-off-by John Hubbard <[email protected]>--- fs/nfs/direct.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
Quoted 37 lines
fs/nfs/direct.c +2
-9@@ -276,13 +276,6 @@ ssize_t nfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)return nfs_file_direct_write (iocb, iter); } -static void nfs_direct_release_pages (struct page **pages,unsigned int npages) -{ -unsigned int i; -for (i =0 ; i < npages; i++) -put_page (pages[i]); -} -void nfs_init_cinfo_from_dreq (struct nfs_commit_info *cinfo,struct nfs_direct_req *dreq) {@@ -512,7 +505,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, pos += req_len; dreq->bytes_left -= req_len; } -nfs_direct_release_pages (pagevec, npages); +put_user_pages (pagevec, npages);kvfree (pagevec);if (result <0 )break ;@@ -935,7 +928,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, pos += req_len; dreq->bytes_left -= req_len; } -nfs_direct_release_pages (pagevec, npages); +put_user_pages (pagevec, npages);kvfree (pagevec);if (result <0 )break ;
PATCH v2 32/34 goldfish_pipe: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
Note that this effectively changes the code's behavior in qp_release_pages(): it now ultimately calls set_page_dirty_lock(), instead of set_page_dirty(). This is probably more accurate.
As Christoph Hellwig put it, "set_page_dirty() is only safe if we are dealing with a file backed page where we have reference on the inode it hangs off." [1]
[1] https://lore.kernel.org/r/[email protected]
--- drivers/platform/goldfish/goldfish_pipe.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/platform/goldfish/goldfish_pipe.c +3 -6
@@ -288,15 +288,12 @@ static int pin_user_pages(unsigned long first_page,static void release_user_pages (struct page **pages,int pages_count,int is_write,s32 consumed_size) { -int i; +bool dirty = !is_write && consumed_size >0 ; -for (i =0 ; i < pages_count; i++) { -if (!is_write && consumed_size >0 ) -set_page_dirty (pages[i]); -put_page (pages[i]); - } +put_user_pages_dirty_lock (pages, pages_count, dirty); } +/* Populate the call parameters, merging adjacent pages together */ static void populate_rw_params(struct page **pages, int pages_count,
Signature · 7 lines
2.22.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v2 33/34 kernel/events/core.c: convert put_page() to put_user_page*()
In reply to [email protected]From: John Hubbard <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
--- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +1 -1
@@ -6426,7 +6426,7 @@ static u64 perf_virt_to_phys(u64 virt) phys_addr =page_to_phys (p) + virt %PAGE_SIZE ;if (p) -put_page (p); +put_user_page (p); }return phys_addr;
Signature · 1 line
2.22.0
PATCH v2 34/34 fs/binfmt_elf: convert put_page() to put_user_page*()
In reply to [email protected]From: Ira Weiny <[email protected]>
For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions").
get_dump_page calls get_user_page so put_user_page must be used to match.
--- fs/binfmt_elf.c | 2 +- fs/binfmt_elf_fdpic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/binfmt_elf.c +1 -1
@@ -2377,7 +2377,7 @@ static int elf_core_dump(struct coredump_params *cprm)void *kaddr =kmap (page); stop = !dump_emit (cprm, kaddr,PAGE_SIZE );kunmap (page); -put_page (page); +put_user_page (page); }else stop = !dump_skip (cprm,PAGE_SIZE );if (stop)
fs/binfmt_elf_fdpic.c +1 -1
@@ -1511,7 +1511,7 @@ static bool elf_fdpic_dump_segments(struct coredump_params *cprm)void *kaddr =kmap (page); res =dump_emit (cprm, kaddr,PAGE_SIZE );kunmap (page); -put_page (page); +put_user_page (page); }else { res =dump_skip (cprm,PAGE_SIZE ); }
Signature · 1 line
2.22.0
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for put_user_pages(): miscellaneous call sites
In reply to [email protected]== Series Details ==
== Series Details ==
Series: put_user_pages(): miscellaneous call sites
URL : https://patchwork.freedesktop.org/series/64950/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
d134d48f6ff8 mm/gup: add make_dirty arg to put_user_pages_dirty_lock()
4ff1243be3c3 net/rds: convert put_page() to put_user_page*()
0ec781ff456d net/ceph: convert put_page() to put_user_page*()
5bbbd3f8b4c9 x86/kvm: convert put_page() to put_user_page*()
9bece95d1b23 drm/etnaviv: convert release_pages() to put_user_pages()
971c3220853f drm/i915: convert put_page() to put_user_page*()
1adc5ac927c1 drm/radeon: convert put_page() to put_user_page*()
c55a4d00d22e media/ivtv: convert put_page() to put_user_page*()
ff7c486271a6 media/v4l2-core/mm: convert put_page() to put_user_page*()
47615742cfd9 genwqe: convert put_page() to put_user_page*()
f8bfe3afcc95 scif: convert put_page() to put_user_page*()
-:31: CHECK:BRACES: braces {} should be used on all arms of this statement
#31: FILE: drivers/misc/mic/scif/scif_rma.c:116:
+ if (kernel) {
[...]
}
[...]-:39: CHECK:BRACES: Unbalanced braces around else statement #39: FILE: drivers/misc/mic/scif/scif_rma.c:122:
+ } else
total: 0 errors, 0 warnings, 2 checks, 32 lines checked 1748e09b9a62 vmci: convert put_page() to put_user_page*() ba16cdbe5ff0 rapidio: convert put_page() to put_user_page*() ae075ddcac12 oradax: convert put_page() to put_user_page*() d29a99280436 staging/vc04_services: convert put_page() to put_user_page*() 9ef9f335b31d drivers/tee: convert put_page() to put_user_page*() f9493a1d2725 vfio: convert put_page() to put_user_page*() da1a08e62f21 fbdev/pvr2fb: convert put_page() to put_user_page*() a6db3836ffb4 fsl_hypervisor: convert put_page() to put_user_page*() c8ba20cdefa1 xen: convert put_page() to put_user_page*() 36e7ff6fabf9 fs/exec.c: convert put_page() to put_user_page*() af09e87179b8 orangefs: convert put_page() to put_user_page*() 8246acd83ae4 uprobes: convert put_page() to put_user_page*() 21ebbc4bdeb3 futex: convert put_page() to put_user_page*() 508bcf1a0971 mm/frame_vector.c: convert put_page() to put_user_page*() d30e57fca2e4 mm/gup_benchmark.c: convert put_page() to put_user_page*() c10c39bcf031 mm/memory.c: convert put_page() to put_user_page*() 8c3ec3863201 mm/madvise.c: convert put_page() to put_user_page*() 0a0b958ddbc1 mm/process_vm_access.c: convert put_page() to put_user_page*() cdc46be6b3ab crypt: convert put_page() to put_user_page*() c1512bf45ef0 fs/nfs: convert put_page() to put_user_page*() e07d0ef8560f goldfish_pipe: convert put_page() to put_user_page*() -:46: CHECK:LINE_SPACING: Please don't use multiple blank lines #46: FILE: drivers/platform/goldfish/goldfish_pipe.c:296:
+
total: 0 errors, 0 warnings, 1 checks, 18 lines checked 6624069b17d0 kernel/events/core.c: convert put_page() to put_user_page*() 93634df2e145 fs/binfmt_elf: convert put_page() to put_user_page*()
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for put_user_pages(): miscellaneous call sites
In reply to [email protected]== Series Details ==
== Series Details ==
Series: put_user_pages(): miscellaneous call sites
URL : https://patchwork.freedesktop.org/series/64950/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6667 -> Patchwork_13939
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/
Known issues
------------
Here are the changes found in Patchwork_13939 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@read_all_entries:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/fi-icl-u3/igt@debugfs_test@read_all_entries.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/fi-icl-u3/igt@debugfs_test@read_all_entries.html
* igt@kms_busy@basic-flip-c:
- fi-kbl-7500u: [PASS][3] -> [SKIP][4] ([fdo#109271] / [fdo#109278]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/fi-kbl-7500u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/fi-kbl-7500u/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: [PASS][5] -> [WARN][6] ([fdo#109380])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/fi-kbl-7567u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/fi-kbl-7567u/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- fi-kbl-7567u: [PASS][7] -> [SKIP][8] ([fdo#109271]) +23 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/fi-kbl-7567u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/fi-kbl-7567u/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [DMESG-FAIL][9] ([fdo#111108]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
* igt@kms_chamelium@dp-crc-fast:
- fi-cml-u2: [FAIL][11] ([fdo#110627]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/fi-cml-u2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/fi-cml-u2/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7567u: [FAIL][13] ([fdo#109485]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/fi-kbl-7567u/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/fi-kbl-7567u/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [DMESG-WARN][15] ([fdo#102614]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/fi-hsw-peppy/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/fi-hsw-peppy/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#110627]: https://bugs.freedesktop.org/show_bug.cgi?id=110627
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
Participating hosts (55 -> 46)
------------------------------
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6667 -> Patchwork_13939
CI-20190529: 20190529
CI_DRM_6667: e4aebcb3848d8118eb9d42456bdff183268b221c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5127: f43f5fa12ac1b93febfe3eeb9e9985f5f3e2eff0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13939: 93634df2e14512336813b4185003df02762d3f5c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
93634df2e145 fs/binfmt_elf: convert put_page() to put_user_page*() 6624069b17d0 kernel/events/core.c: convert put_page() to put_user_page*() e07d0ef8560f goldfish_pipe: convert put_page() to put_user_page*() c1512bf45ef0 fs/nfs: convert put_page() to put_user_page*() cdc46be6b3ab crypt: convert put_page() to put_user_page*() 0a0b958ddbc1 mm/process_vm_access.c: convert put_page() to put_user_page*() 8c3ec3863201 mm/madvise.c: convert put_page() to put_user_page*() c10c39bcf031 mm/memory.c: convert put_page() to put_user_page*() d30e57fca2e4 mm/gup_benchmark.c: convert put_page() to put_user_page*() 508bcf1a0971 mm/frame_vector.c: convert put_page() to put_user_page*() 21ebbc4bdeb3 futex: convert put_page() to put_user_page*() 8246acd83ae4 uprobes: convert put_page() to put_user_page*() af09e87179b8 orangefs: convert put_page() to put_user_page*() 36e7ff6fabf9 fs/exec.c: convert put_page() to put_user_page*() c8ba20cdefa1 xen: convert put_page() to put_user_page*() a6db3836ffb4 fsl_hypervisor: convert put_page() to put_user_page*() da1a08e62f21 fbdev/pvr2fb: convert put_page() to put_user_page*() f9493a1d2725 vfio: convert put_page() to put_user_page*() 9ef9f335b31d drivers/tee: convert put_page() to put_user_page*() d29a99280436 staging/vc04_services: convert put_page() to put_user_page*() ae075ddcac12 oradax: convert put_page() to put_user_page*() ba16cdbe5ff0 rapidio: convert put_page() to put_user_page*() 1748e09b9a62 vmci: convert put_page() to put_user_page*() f8bfe3afcc95 scif: convert put_page() to put_user_page*() 47615742cfd9 genwqe: convert put_page() to put_user_page*() ff7c486271a6 media/v4l2-core/mm: convert put_page() to put_user_page*() c55a4d00d22e media/ivtv: convert put_page() to put_user_page*() 1adc5ac927c1 drm/radeon: convert put_page() to put_user_page*() 971c3220853f drm/i915: convert put_page() to put_user_page*() 9bece95d1b23 drm/etnaviv: convert release_pages() to put_user_pages() 5bbbd3f8b4c9 x86/kvm: convert put_page() to put_user_page*() 0ec781ff456d net/ceph: convert put_page() to put_user_page*() 4ff1243be3c3 net/rds: convert put_page() to put_user_page*() d134d48f6ff8 mm/gup: add make_dirty arg to put_user_pages_dirty_lock()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for put_user_pages(): miscellaneous call sites
In reply to [email protected]== Series Details ==
== Series Details ==
Series: put_user_pages(): miscellaneous call sites
URL : https://patchwork.freedesktop.org/series/64950/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6667_full -> Patchwork_13939_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13939_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#110854])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb3/igt@[email protected]
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#111325]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-bsd2:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276]) +13 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb3/igt@[email protected]
* igt@gem_softpin@noreloc-s3:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([fdo#104108])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-skl4/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-skl4/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][9] -> [DMESG-WARN][10] ([fdo#108566]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-apl6/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-apl6/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][11] -> [FAIL][12] ([fdo#105363])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-skl9/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-skl5/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-skl: [PASS][13] -> [INCOMPLETE][14] ([fdo#109507])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-skl4/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-skl8/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw:
- shard-iclb: [PASS][15] -> [FAIL][16] ([fdo#103167]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb8/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb1/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- shard-kbl: [PASS][17] -> [DMESG-WARN][18] ([fdo#108566])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-kbl4/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-kbl4/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][19] -> [FAIL][20] ([fdo#108145] / [fdo#110403])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-skl5/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-skl2/igt@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb8/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][23] -> [FAIL][24] ([fdo#99912])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-apl6/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-apl6/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@vecs0-s3:
- shard-apl: [DMESG-WARN][25] ([fdo#108566]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-apl5/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-apl4/igt@[email protected]
* igt@gem_exec_blt@dumb-buf-min:
- shard-apl: [INCOMPLETE][27] ([fdo#103927]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-apl1/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-apl5/igt@[email protected]
* igt@gem_exec_schedule@preempt-bsd:
- shard-iclb: [SKIP][29] ([fdo#111325]) -> [PASS][30] +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb4/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb5/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: [FAIL][31] ([fdo#105363]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-glk5/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-glk4/igt@[email protected]
* igt@kms_flip@flip-vs-panning-interruptible:
- shard-hsw: [INCOMPLETE][33] ([fdo#103540]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-hsw7/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-hsw5/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [FAIL][35] ([fdo#103167]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@psr-suspend:
- shard-skl: [INCOMPLETE][37] ([fdo#104108] / [fdo#106978]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-skl4/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-skl9/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-kbl: [INCOMPLETE][39] ([fdo#103665]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-kbl6/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-kbl1/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-kbl: [DMESG-WARN][41] ([fdo#108566]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-kbl6/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-kbl6/igt@[email protected]
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][43] ([fdo#109642] / [fdo#111068]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb2/igt@[email protected]
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [SKIP][45] ([fdo#109441]) -> [PASS][46] +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb7/igt@kms_psr@psr2_sprite_mmap_gtt.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
* igt@perf_pmu@rc6-runtime-pm-long:
- shard-iclb: [FAIL][47] ([fdo#105010]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb6/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb2/igt@[email protected]
* igt@prime_vgem@fence-wait-bsd2:
- shard-iclb: [SKIP][49] ([fdo#109276]) -> [PASS][50] +17 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb6/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb2/igt@[email protected]
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [FAIL][51] ([fdo#111329]) -> [SKIP][52] ([fdo#109276])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb2/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb8/igt@[email protected]
* igt@gem_mocs_settings@mocs-rc6-bsd2:
- shard-iclb: [SKIP][53] ([fdo#109276]) -> [FAIL][54] ([fdo#111330])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb3/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb4/igt@[email protected]
* igt@gem_mocs_settings@mocs-reset-bsd2:
- shard-iclb: [FAIL][55] ([fdo#111330]) -> [SKIP][56] ([fdo#109276])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb2/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb8/igt@[email protected]
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][57] ([fdo#109349]) -> [DMESG-WARN][58] ([fdo#107724])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6667/shard-iclb7/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/shard-iclb2/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105010]: https://bugs.freedesktop.org/show_bug.cgi?id=105010
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 9)
------------------------------
Missing (1): pig-hsw-4770r
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6667 -> Patchwork_13939
CI-20190529: 20190529
CI_DRM_6667: e4aebcb3848d8118eb9d42456bdff183268b221c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5127: f43f5fa12ac1b93febfe3eeb9e9985f5f3e2eff0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13939: 93634df2e14512336813b4185003df02762d3f5c @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13939/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx