--- v2
+++ v3
@@ -7,53 +7,110 @@
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.
-
-Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-Cc: Frank Haverkamp <haver@linux.vnet.ibm.com>
-Cc: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+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/misc/genwqe/card_utils.c | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
+ drivers/media/pci/ivtv/ivtv-udma.c | 14 ++++----------
+ drivers/media/pci/ivtv/ivtv-yuv.c | 11 +++--------
+ 2 files changed, 7 insertions(+), 18 deletions(-)
-diff --git a/drivers/misc/genwqe/card_utils.c b/drivers/misc/genwqe/card_utils.c
-index 2e1c4d2905e8..2a888f31d2c5 100644
---- a/drivers/misc/genwqe/card_utils.c
-+++ b/drivers/misc/genwqe/card_utils.c
-@@ -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)
+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,
{
-- 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]);
+ 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_dirty_lock(page_list, nr_pages, dirty);
- return 0;
++ 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..2c61a11d391d 100644
+--- a/drivers/media/pci/ivtv/ivtv-yuv.c
++++ b/drivers/media/pci/ivtv/ivtv-yuv.c
+@@ -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;
+ }
--
2.22.0