From: john.hubbard@gmail.com
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Christoph Hellwig" <hch@infradead.org>,
"Dan Williams" <dan.j.williams@intel.com>,
"Dave Chinner" <david@fromorbit.com>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"Ira Weiny" <ira.weiny@intel.com>, "Jan Kara" <jack@suse.cz>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"Jérôme Glisse" <jglisse@redhat.com>,
LKML <linux-kernel@vger.kernel.org>,
amd-gfx@lists.freedesktop.org, ceph-devel@vger.kernel.org,
devel@driverdev.osuosl.org, devel@lists.orangefs.org,
dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-block@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-fbdev@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-media@vger.kernel.org, linux-mm@kvack.org,
linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org,
linux-rpi-kernel@lists.infradead.org, linux-xfs@vger.kernel.org,
netdev@vger.kernel.org, rds-devel@oss.oracle.com,
sparclinux@vger.kernel.org, x86@kernel.org,
xen-devel@lists.xenproject.org,
"John Hubbard" <jhubbard@nvidia.com>,
"Al Viro" <viro@zeniv.linux.org.uk>,
"Andrea Arcangeli" <aarcange@redhat.com>,
"Christopher Yeoh" <cyeoh@au1.ibm.com>,
"Heiko Carstens" <heiko.carstens@de.ibm.com>,
"Ingo Molnar" <mingo@kernel.org>, "Jann Horn" <jann@thejh.net>,
"Lorenzo Stoakes" <lstoakes@gmail.com>,
"Mathieu Desnoyers" <mathieu.desnoyers@efficios.com>,
"Mike Rapoport" <rppt@linux.vnet.ibm.com>,
"Rashika Kheria" <rashika.kheria@gmail.com>
Subject: [PATCH 29/34] mm/process_vm_access.c: convert put_page() to put_user_page*()
Date: Thu, 1 Aug 2019 19:20:00 -0700 [thread overview]
Message-ID: <20190802022005.5117-30-jhubbard@nvidia.com> (raw)
In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com>
From: John Hubbard <jhubbard@nvidia.com>
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").
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Christopher Yeoh <cyeoh@au1.ibm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jann Horn <jann@thejh.net>
Cc: Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
mm/process_vm_access.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
index 357aa7bef6c0..4d29d54ec93f 100644
--- a/mm/process_vm_access.c
+++ b/mm/process_vm_access.c
@@ -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;
--
2.22.0
next prev parent reply other threads:[~2019-08-02 2:22 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-02 2:19 [PATCH 00/34] put_user_pages(): miscellaneous call sites john.hubbard
2019-08-02 2:19 ` [PATCH 01/34] mm/gup: add make_dirty arg to put_user_pages_dirty_lock() john.hubbard
2019-08-02 2:19 ` [PATCH 02/34] net/rds: convert put_page() to put_user_page*() john.hubbard
2019-08-02 2:19 ` [PATCH 03/34] net/ceph: " john.hubbard
2019-08-02 22:32 ` Jeff Layton
2019-08-02 2:19 ` [PATCH 04/34] x86/kvm: " john.hubbard
2019-08-02 2:19 ` [PATCH 05/34] drm/etnaviv: convert release_pages() to put_user_pages() john.hubbard
2019-08-02 2:19 ` [PATCH 06/34] drm/i915: convert put_page() to put_user_page*() john.hubbard
2019-08-02 9:19 ` Joonas Lahtinen
2019-08-02 18:48 ` John Hubbard
2019-08-03 20:03 ` John Hubbard
2019-08-02 2:19 ` [PATCH 07/34] drm/radeon: " john.hubbard
2019-08-02 2:19 ` [PATCH 08/34] media/ivtv: " john.hubbard
2019-08-02 2:19 ` [PATCH 09/34] media/v4l2-core/mm: " john.hubbard
2019-08-02 2:19 ` [PATCH 10/34] genwqe: " john.hubbard
2019-08-03 7:06 ` Greg Kroah-Hartman
2019-08-02 2:19 ` [PATCH 11/34] scif: " john.hubbard
2019-08-02 2:19 ` [PATCH 12/34] vmci: " john.hubbard
2019-08-02 2:19 ` [PATCH 13/34] rapidio: " john.hubbard
2019-08-02 2:19 ` [PATCH 14/34] oradax: " john.hubbard
2019-08-02 2:19 ` [PATCH 15/34] staging/vc04_services: " john.hubbard
2019-08-03 7:06 ` Greg Kroah-Hartman
2019-08-02 2:19 ` [PATCH 16/34] drivers/tee: " john.hubbard
2019-08-02 6:29 ` Jens Wiklander
2019-08-02 18:51 ` John Hubbard
2019-08-02 2:19 ` [PATCH 17/34] vfio: " john.hubbard
2019-08-02 2:19 ` [PATCH 18/34] fbdev/pvr2fb: " john.hubbard
2019-08-02 2:19 ` [PATCH 19/34] fsl_hypervisor: " john.hubbard
2019-08-02 2:19 ` [PATCH 20/34] xen: " john.hubbard
2019-08-02 4:36 ` Juergen Gross
2019-08-02 5:48 ` John Hubbard
2019-08-02 6:10 ` Juergen Gross
2019-08-02 16:09 ` Weiny, Ira
2019-08-02 19:25 ` John Hubbard
2019-08-02 2:19 ` [PATCH 21/34] fs/exec.c: " john.hubbard
2019-08-02 2:19 ` [PATCH 22/34] orangefs: " john.hubbard
2019-08-02 2:19 ` [PATCH 23/34] uprobes: " john.hubbard
2019-08-02 2:19 ` [PATCH 24/34] futex: " john.hubbard
2019-08-02 2:19 ` [PATCH 25/34] mm/frame_vector.c: " john.hubbard
2019-08-02 2:19 ` [PATCH 26/34] mm/gup_benchmark.c: " john.hubbard
2019-08-02 14:19 ` Keith Busch
2019-08-02 2:19 ` [PATCH 27/34] mm/memory.c: " john.hubbard
2019-08-02 2:19 ` [PATCH 28/34] mm/madvise.c: " john.hubbard
2019-08-02 2:20 ` john.hubbard [this message]
2019-08-02 2:20 ` [PATCH 30/34] crypt: " john.hubbard
2019-08-02 2:20 ` [PATCH 31/34] nfs: " john.hubbard
2019-08-03 1:27 ` Calum Mackay
2019-08-03 1:41 ` John Hubbard
2019-08-04 23:28 ` Calum Mackay
2019-08-02 2:20 ` [PATCH 32/34] goldfish_pipe: " john.hubbard
2019-08-02 2:20 ` [PATCH 33/34] kernel/events/core.c: " john.hubbard
2019-08-02 2:20 ` [PATCH 34/34] fs/binfmt_elf: " john.hubbard
2019-08-02 9:12 ` [PATCH 00/34] put_user_pages(): miscellaneous call sites Michal Hocko
2019-08-02 12:41 ` Jan Kara
2019-08-02 14:24 ` Matthew Wilcox
2019-08-02 14:52 ` Jan Kara
2019-08-02 19:14 ` John Hubbard
2019-08-07 8:37 ` Jan Kara
2019-08-07 8:46 ` Michal Hocko
2019-08-08 2:36 ` Ira Weiny
2019-08-08 3:46 ` John Hubbard
2019-08-08 16:25 ` Weiny, Ira
2019-08-08 18:18 ` John Hubbard
2019-08-09 8:34 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190802022005.5117-30-jhubbard@nvidia.com \
--to=john.hubbard@gmail.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=amd-gfx@lists.freedesktop.org \
--cc=ceph-devel@vger.kernel.org \
--cc=cyeoh@au1.ibm.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=david@fromorbit.com \
--cc=devel@driverdev.osuosl.org \
--cc=devel@lists.orangefs.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=hch@infradead.org \
--cc=heiko.carstens@de.ibm.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ira.weiny@intel.com \
--cc=jack@suse.cz \
--cc=jann@thejh.net \
--cc=jgg@ziepe.ca \
--cc=jglisse@redhat.com \
--cc=jhubbard@nvidia.com \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-xfs@vger.kernel.org \
--cc=lstoakes@gmail.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rashika.kheria@gmail.com \
--cc=rds-devel@oss.oracle.com \
--cc=rppt@linux.vnet.ibm.com \
--cc=sparclinux@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).