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>,
"Andy Walls" <awalls@md.metrocast.net>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>
Subject: [PATCH 08/34] media/ivtv: convert put_page() to put_user_page*()
Date: Thu, 1 Aug 2019 19:19:39 -0700 [thread overview]
Message-ID: <20190802022005.5117-9-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: Andy Walls <awalls@md.metrocast.net>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
drivers/media/pci/ivtv/ivtv-udma.c | 14 ++++----------
drivers/media/pci/ivtv/ivtv-yuv.c | 10 +++-------
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/drivers/media/pci/ivtv/ivtv-udma.c b/drivers/media/pci/ivtv/ivtv-udma.c
index 5f8883031c9c..7c7f33c2412b 100644
--- a/drivers/media/pci/ivtv/ivtv-udma.c
+++ b/drivers/media/pci/ivtv/ivtv-udma.c
@@ -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;
}
diff --git a/drivers/media/pci/ivtv/ivtv-yuv.c b/drivers/media/pci/ivtv/ivtv-yuv.c
index cd2fe2d444c0..9465a7d450b6 100644
--- a/drivers/media/pci/ivtv/ivtv-yuv.c
+++ b/drivers/media/pci/ivtv/ivtv-yuv.c
@@ -81,8 +81,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 +92,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 +110,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;
}
--
2.22.0
next prev parent reply other threads:[~2019-08-02 2:26 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 ` john.hubbard [this message]
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 ` [PATCH 29/34] mm/process_vm_access.c: " john.hubbard
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-9-jhubbard@nvidia.com \
--to=john.hubbard@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=amd-gfx@lists.freedesktop.org \
--cc=awalls@md.metrocast.net \
--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=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=mchehab@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rds-devel@oss.oracle.com \
--cc=sparclinux@vger.kernel.org \
--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).