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>,
"Sudeep Dutt" <sudeep.dutt@intel.com>,
"Ashutosh Dixit" <ashutosh.dixit@intel.com>,
"Arnd Bergmann" <arnd@arndb.de>, "Joerg Roedel" <jroedel@suse.de>,
"Robin Murphy" <robin.murphy@arm.com>,
"Zhen Lei" <thunder.leizhen@huawei.com>
Subject: [PATCH v3 13/41] scif: convert put_page() to put_user_page*()
Date: Tue, 6 Aug 2019 18:33:12 -0700 [thread overview]
Message-ID: <20190807013340.9706-14-jhubbard@nvidia.com> (raw)
In-Reply-To: <20190807013340.9706-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: Sudeep Dutt <sudeep.dutt@intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
drivers/misc/mic/scif/scif_rma.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c
index 01e27682ea30..d84ed9466920 100644
--- a/drivers/misc/mic/scif/scif_rma.c
+++ b/drivers/misc/mic/scif/scif_rma.c
@@ -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;
--
2.22.0
next prev parent reply other threads:[~2019-08-07 1:34 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 1:32 [PATCH v3 00/39] put_user_pages(): miscellaneous call sites john.hubbard
2019-08-07 1:33 ` [PATCH v3 01/41] mm/gup: add make_dirty arg to put_user_pages_dirty_lock() john.hubbard
2019-08-07 1:33 ` [PATCH v3 02/41] drivers/gpu/drm/via: convert put_page() to put_user_page*() john.hubbard
2019-08-07 1:33 ` [PATCH v3 03/41] net/xdp: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 04/41] net/rds: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 05/41] net/ceph: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 06/41] x86/kvm: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 07/41] drm/etnaviv: convert release_pages() to put_user_pages() john.hubbard
2019-08-07 1:33 ` [PATCH v3 08/41] drm/i915: convert put_page() to put_user_page*() john.hubbard
2019-08-07 1:33 ` [PATCH v3 09/41] drm/radeon: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 10/41] media/ivtv: " john.hubbard
2019-08-07 8:51 ` Hans Verkuil
2019-08-07 1:33 ` [PATCH v3 11/41] media/v4l2-core/mm: " john.hubbard
2019-08-07 7:20 ` Sakari Ailus
2019-08-07 8:07 ` Hans Verkuil
2019-08-07 1:33 ` [PATCH v3 12/41] genwqe: " john.hubbard
2019-08-07 1:33 ` john.hubbard [this message]
2019-08-07 1:33 ` [PATCH v3 14/41] vmci: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 15/41] rapidio: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 16/41] oradax: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 17/41] staging/vc04_services: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 18/41] drivers/tee: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 19/41] vfio: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 20/41] fbdev/pvr2fb: " john.hubbard
2019-08-09 11:38 ` Bartlomiej Zolnierkiewicz
2019-08-07 1:33 ` [PATCH v3 21/41] fsl_hypervisor: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 22/41] xen: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 23/41] fs/exec.c: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 24/41] orangefs: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 25/41] uprobes: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 26/41] futex: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 27/41] mm/frame_vector.c: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 28/41] mm/gup_benchmark.c: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 29/41] mm/memory.c: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 30/41] mm/madvise.c: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 31/41] mm/process_vm_access.c: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 32/41] crypt: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 33/41] fs/nfs: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 34/41] goldfish_pipe: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 35/41] kernel/events/core.c: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 36/41] fs/binfmt_elf: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 37/41] security/tomoyo: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 38/41] powerpc: " john.hubbard
2019-08-08 5:42 ` Michael Ellerman
2019-08-09 1:26 ` John Hubbard
2019-08-09 12:20 ` Michael Ellerman
2019-08-07 1:33 ` [PATCH v3 39/41] mm/mlock.c: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 40/41] mm/mempolicy.c: " john.hubbard
2019-08-07 1:33 ` [PATCH v3 41/41] mm/ksm: " john.hubbard
2019-08-07 1:49 ` [PATCH v3 00/39] put_user_pages(): miscellaneous call sites John Hubbard
2019-08-30 1:29 ` Mike Marshall
2019-08-30 2:21 ` John Hubbard
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=20190807013340.9706-14-jhubbard@nvidia.com \
--to=john.hubbard@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=amd-gfx@lists.freedesktop.org \
--cc=arnd@arndb.de \
--cc=ashutosh.dixit@intel.com \
--cc=ceph-devel@vger.kernel.org \
--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=intel-gfx@lists.freedesktop.org \
--cc=ira.weiny@intel.com \
--cc=jack@suse.cz \
--cc=jgg@ziepe.ca \
--cc=jglisse@redhat.com \
--cc=jhubbard@nvidia.com \
--cc=jroedel@suse.de \
--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=netdev@vger.kernel.org \
--cc=rds-devel@oss.oracle.com \
--cc=robin.murphy@arm.com \
--cc=sparclinux@vger.kernel.org \
--cc=sudeep.dutt@intel.com \
--cc=thunder.leizhen@huawei.com \
--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).