From: Jan Kara <jack@suse.com>
To: linux-mm@kvack.org
Cc: Jan Kara <jack@suse.cz>, Andy Walls <awalls@md.metrocast.net>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
linux-media@vger.kernel.org
Subject: [PATCH 7/7] [media] ivtv: Convert to get_user_pages_unlocked()
Date: Tue, 6 Oct 2015 11:24:30 +0200 [thread overview]
Message-ID: <1444123470-4932-8-git-send-email-jack@suse.com> (raw)
In-Reply-To: <1444123470-4932-1-git-send-email-jack@suse.com>
From: Jan Kara <jack@suse.cz>
Convert ivtv_yuv_prep_user_dma() to use get_user_pages_unlocked() so
that we don't unnecessarily leak knowledge about mm locking into drivers
code.
CC: Andy Walls <awalls@md.metrocast.net>
CC: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
CC: linux-media@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
---
drivers/media/pci/ivtv/ivtv-yuv.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/pci/ivtv/ivtv-yuv.c b/drivers/media/pci/ivtv/ivtv-yuv.c
index 2ad65eb29832..2b8e7b2f2b86 100644
--- a/drivers/media/pci/ivtv/ivtv-yuv.c
+++ b/drivers/media/pci/ivtv/ivtv-yuv.c
@@ -75,15 +75,15 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma,
ivtv_udma_get_page_info (&uv_dma, (unsigned long)args->uv_source, 360 * uv_decode_height);
/* Get user pages for DMA Xfer */
- down_read(¤t->mm->mmap_sem);
- y_pages = get_user_pages(current, current->mm, y_dma.uaddr, y_dma.page_count, 0, 1, &dma->map[0], NULL);
+ y_pages = get_user_pages_unlocked(current, current->mm,
+ y_dma.uaddr, y_dma.page_count, 0, 1,
+ &dma->map[0]);
uv_pages = 0; /* silence gcc. value is set and consumed only if: */
if (y_pages == y_dma.page_count) {
- uv_pages = get_user_pages(current, current->mm,
- uv_dma.uaddr, uv_dma.page_count, 0, 1,
- &dma->map[y_pages], NULL);
+ uv_pages = get_user_pages_unlocked(current, current->mm,
+ uv_dma.uaddr, uv_dma.page_count, 0, 1,
+ &dma->map[y_pages]);
}
- up_read(¤t->mm->mmap_sem);
if (y_pages != y_dma.page_count || uv_pages != uv_dma.page_count) {
int rc = -EFAULT;
--
2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.com>
To: linux-mm@kvack.org
Cc: Jan Kara <jack@suse.cz>, Andy Walls <awalls@md.metrocast.net>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
linux-media@vger.kernel.org
Subject: [PATCH 7/7] [media] ivtv: Convert to get_user_pages_unlocked()
Date: Tue, 6 Oct 2015 11:24:30 +0200 [thread overview]
Message-ID: <1444123470-4932-8-git-send-email-jack@suse.com> (raw)
In-Reply-To: <1444123470-4932-1-git-send-email-jack@suse.com>
From: Jan Kara <jack@suse.cz>
Convert ivtv_yuv_prep_user_dma() to use get_user_pages_unlocked() so
that we don't unnecessarily leak knowledge about mm locking into drivers
code.
CC: Andy Walls <awalls@md.metrocast.net>
CC: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
CC: linux-media@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
---
drivers/media/pci/ivtv/ivtv-yuv.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/pci/ivtv/ivtv-yuv.c b/drivers/media/pci/ivtv/ivtv-yuv.c
index 2ad65eb29832..2b8e7b2f2b86 100644
--- a/drivers/media/pci/ivtv/ivtv-yuv.c
+++ b/drivers/media/pci/ivtv/ivtv-yuv.c
@@ -75,15 +75,15 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma,
ivtv_udma_get_page_info (&uv_dma, (unsigned long)args->uv_source, 360 * uv_decode_height);
/* Get user pages for DMA Xfer */
- down_read(¤t->mm->mmap_sem);
- y_pages = get_user_pages(current, current->mm, y_dma.uaddr, y_dma.page_count, 0, 1, &dma->map[0], NULL);
+ y_pages = get_user_pages_unlocked(current, current->mm,
+ y_dma.uaddr, y_dma.page_count, 0, 1,
+ &dma->map[0]);
uv_pages = 0; /* silence gcc. value is set and consumed only if: */
if (y_pages == y_dma.page_count) {
- uv_pages = get_user_pages(current, current->mm,
- uv_dma.uaddr, uv_dma.page_count, 0, 1,
- &dma->map[y_pages], NULL);
+ uv_pages = get_user_pages_unlocked(current, current->mm,
+ uv_dma.uaddr, uv_dma.page_count, 0, 1,
+ &dma->map[y_pages]);
}
- up_read(¤t->mm->mmap_sem);
if (y_pages != y_dma.page_count || uv_pages != uv_dma.page_count) {
int rc = -EFAULT;
--
2.1.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-10-06 9:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-06 9:24 [PATCH 0/7] get_user_pages() cleanup Jan Kara
2015-10-06 9:24 ` Jan Kara
2015-10-06 9:24 ` Jan Kara
2015-10-06 9:24 ` [PATCH 1/7] cris: Convert cryptocop to use get_user_pages_fast() Jan Kara
2015-10-06 9:53 ` Mikael Starvik
2015-10-09 14:41 ` Jesper Nilsson
2015-10-06 9:24 ` [PATCH 2/7] ia64: Use get_user_pages_fast() in err_inject.c Jan Kara
2015-10-06 9:24 ` Jan Kara
2015-10-06 9:24 ` [PATCH 3/7] drm: Convert via driver to use get_user_pages_fast() Jan Kara
2015-10-06 9:24 ` [PATCH 4/7] fsl_hypervisor: Convert ioctl_memcpy() " Jan Kara
[not found] ` <1444123470-4932-1-git-send-email-jack-IBi9RG/b67k@public.gmane.org>
2015-10-06 9:24 ` [PATCH 5/7] IB/mthca: Convert mthca_map_user_db() " Jan Kara
2015-10-06 9:24 ` Jan Kara
2015-10-06 9:24 ` [PATCH 6/7] drm/i915: Convert to use get_user_page_unlocked() Jan Kara
2015-10-06 9:24 ` Jan Kara [this message]
2015-10-06 9:24 ` [PATCH 7/7] [media] ivtv: Convert to get_user_pages_unlocked() 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=1444123470-4932-8-git-send-email-jack@suse.com \
--to=jack@suse.com \
--cc=awalls@md.metrocast.net \
--cc=jack@suse.cz \
--cc=linux-media@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mchehab@osg.samsung.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.