From: Jan Kara <jack@suse.cz> To: linux-mm@kvack.org Cc: linux-media@vger.kernel.org, Jan Kara <jack@suse.cz> Subject: [PATCH 2/9] media: omap_vout: Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns() Date: Mon, 17 Mar 2014 20:49:29 +0100 [thread overview] Message-ID: <1395085776-8626-3-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1395085776-8626-1-git-send-email-jack@suse.cz> Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns() instead of hand made mapping of virtual address to physical address. Also the function leaked page reference from get_user_pages() so fix that by properly release the reference when omap_vout_buffer_release() is called. Signed-off-by: Jan Kara <jack@suse.cz> --- drivers/media/platform/omap/omap_vout.c | 63 +++++++++++++++------------------ 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index dfd0a21a0658..8c5803e4ce15 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c @@ -199,43 +199,31 @@ static int omap_vout_try_format(struct v4l2_pix_format *pix) * omap_vout_uservirt_to_phys: This inline function is used to convert user * space virtual address to physical address. */ -static u32 omap_vout_uservirt_to_phys(u32 virtp) +static int omap_vout_get_userptr(struct videobuf_buffer *vb, u32 virtp, + u32 *physp) { - unsigned long physp = 0; - struct vm_area_struct *vma; - struct mm_struct *mm = current->mm; + struct pinned_pfns *pfns; + int ret; /* For kernel direct-mapped memory, take the easy way */ - if (virtp >= PAGE_OFFSET) - return virt_to_phys((void *) virtp); - - down_read(¤t->mm->mmap_sem); - vma = find_vma(mm, virtp); - if (vma && (vma->vm_flags & VM_IO) && vma->vm_pgoff) { - /* this will catch, kernel-allocated, mmaped-to-usermode - addresses */ - physp = (vma->vm_pgoff << PAGE_SHIFT) + (virtp - vma->vm_start); - up_read(¤t->mm->mmap_sem); - } else { - /* otherwise, use get_user_pages() for general userland pages */ - int res, nr_pages = 1; - struct page *pages; + if (virtp >= PAGE_OFFSET) { + *physp = virt_to_phys((void *)virtp); + return 0; + } - res = get_user_pages(current, current->mm, virtp, nr_pages, 1, - 0, &pages, NULL); - up_read(¤t->mm->mmap_sem); + pfns = pfns_vector_create(1); + if (!pfns) + return -ENOMEM; - if (res == nr_pages) { - physp = __pa(page_address(&pages[0]) + - (virtp & ~PAGE_MASK)); - } else { - printk(KERN_WARNING VOUT_NAME - "get_user_pages failed\n"); - return 0; - } + ret = get_vaddr_pfns(virtp, 1, 1, 0, pfns); + if (ret != 1) { + pfns_vector_destroy(pfns); + return -EINVAL; } + *physp = __pfn_to_phys(pfns_vector_pfns(pfns)[0]); + vb->priv = pfns; - return physp; + return 0; } /* @@ -790,11 +778,15 @@ static int omap_vout_buffer_prepare(struct videobuf_queue *q, * address of the buffer */ if (V4L2_MEMORY_USERPTR == vb->memory) { + int ret; + if (0 == vb->baddr) return -EINVAL; /* Physical address */ - vout->queued_buf_addr[vb->i] = (u8 *) - omap_vout_uservirt_to_phys(vb->baddr); + ret = omap_vout_get_userptr(vb, vb->baddr, + (u32 *)&vout->queued_buf_addr[vb->i]); + if (ret < 0) + return ret; } else { u32 addr, dma_addr; unsigned long size; @@ -843,9 +835,12 @@ static void omap_vout_buffer_release(struct videobuf_queue *q, struct omap_vout_device *vout = q->priv_data; vb->state = VIDEOBUF_NEEDS_INIT; + if (vb->memory == V4L2_MEMORY_USERPTR && vb->priv) { + struct pinned_pfns *pfns = vb->priv; - if (V4L2_MEMORY_MMAP != vout->memory) - return; + put_vaddr_pfns(pfns); + pfns_vector_destroy(pfns); + } } /* -- 1.8.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: linux-mm@kvack.org Cc: linux-media@vger.kernel.org, Jan Kara <jack@suse.cz> Subject: [PATCH 2/9] media: omap_vout: Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns() Date: Mon, 17 Mar 2014 20:49:29 +0100 [thread overview] Message-ID: <1395085776-8626-3-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1395085776-8626-1-git-send-email-jack@suse.cz> Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns() instead of hand made mapping of virtual address to physical address. Also the function leaked page reference from get_user_pages() so fix that by properly release the reference when omap_vout_buffer_release() is called. Signed-off-by: Jan Kara <jack@suse.cz> --- drivers/media/platform/omap/omap_vout.c | 63 +++++++++++++++------------------ 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index dfd0a21a0658..8c5803e4ce15 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c @@ -199,43 +199,31 @@ static int omap_vout_try_format(struct v4l2_pix_format *pix) * omap_vout_uservirt_to_phys: This inline function is used to convert user * space virtual address to physical address. */ -static u32 omap_vout_uservirt_to_phys(u32 virtp) +static int omap_vout_get_userptr(struct videobuf_buffer *vb, u32 virtp, + u32 *physp) { - unsigned long physp = 0; - struct vm_area_struct *vma; - struct mm_struct *mm = current->mm; + struct pinned_pfns *pfns; + int ret; /* For kernel direct-mapped memory, take the easy way */ - if (virtp >= PAGE_OFFSET) - return virt_to_phys((void *) virtp); - - down_read(¤t->mm->mmap_sem); - vma = find_vma(mm, virtp); - if (vma && (vma->vm_flags & VM_IO) && vma->vm_pgoff) { - /* this will catch, kernel-allocated, mmaped-to-usermode - addresses */ - physp = (vma->vm_pgoff << PAGE_SHIFT) + (virtp - vma->vm_start); - up_read(¤t->mm->mmap_sem); - } else { - /* otherwise, use get_user_pages() for general userland pages */ - int res, nr_pages = 1; - struct page *pages; + if (virtp >= PAGE_OFFSET) { + *physp = virt_to_phys((void *)virtp); + return 0; + } - res = get_user_pages(current, current->mm, virtp, nr_pages, 1, - 0, &pages, NULL); - up_read(¤t->mm->mmap_sem); + pfns = pfns_vector_create(1); + if (!pfns) + return -ENOMEM; - if (res == nr_pages) { - physp = __pa(page_address(&pages[0]) + - (virtp & ~PAGE_MASK)); - } else { - printk(KERN_WARNING VOUT_NAME - "get_user_pages failed\n"); - return 0; - } + ret = get_vaddr_pfns(virtp, 1, 1, 0, pfns); + if (ret != 1) { + pfns_vector_destroy(pfns); + return -EINVAL; } + *physp = __pfn_to_phys(pfns_vector_pfns(pfns)[0]); + vb->priv = pfns; - return physp; + return 0; } /* @@ -790,11 +778,15 @@ static int omap_vout_buffer_prepare(struct videobuf_queue *q, * address of the buffer */ if (V4L2_MEMORY_USERPTR == vb->memory) { + int ret; + if (0 == vb->baddr) return -EINVAL; /* Physical address */ - vout->queued_buf_addr[vb->i] = (u8 *) - omap_vout_uservirt_to_phys(vb->baddr); + ret = omap_vout_get_userptr(vb, vb->baddr, + (u32 *)&vout->queued_buf_addr[vb->i]); + if (ret < 0) + return ret; } else { u32 addr, dma_addr; unsigned long size; @@ -843,9 +835,12 @@ static void omap_vout_buffer_release(struct videobuf_queue *q, struct omap_vout_device *vout = q->priv_data; vb->state = VIDEOBUF_NEEDS_INIT; + if (vb->memory == V4L2_MEMORY_USERPTR && vb->priv) { + struct pinned_pfns *pfns = vb->priv; - if (V4L2_MEMORY_MMAP != vout->memory) - return; + put_vaddr_pfns(pfns); + pfns_vector_destroy(pfns); + } } /* -- 1.8.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:[~2014-03-17 19:49 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-03-17 19:49 [RFC] Helper to abstract vma handling in media layer Jan Kara 2014-03-17 19:49 ` Jan Kara 2014-03-17 19:49 ` [PATCH 1/9] mm: Provide new get_vaddr_pfns() helper Jan Kara 2014-03-17 19:49 ` Jan Kara 2014-03-17 20:53 ` Dave Hansen 2014-03-17 20:53 ` Dave Hansen 2014-03-18 10:25 ` Jan Kara 2014-03-18 10:25 ` Jan Kara 2015-04-24 16:21 ` Jan Kara 2015-04-24 16:21 ` Jan Kara 2014-03-17 19:49 ` Jan Kara [this message] 2014-03-17 19:49 ` [PATCH 2/9] media: omap_vout: Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns() Jan Kara 2014-03-17 19:49 ` [PATCH 3/9] media: vb2: Teach vb2_queue_or_prepare_buf() to get pfns for user buffers Jan Kara 2014-03-17 19:49 ` Jan Kara 2014-03-17 19:49 ` [PATCH 4/9] media: vb2: Convert vb2_dma_sg_get_userptr() to use pinned pfns Jan Kara 2014-03-17 19:49 ` Jan Kara 2014-03-17 19:49 ` [PATCH 5/9] media: vb2: Convert vb2_vmalloc_get_userptr() to use pfns vector Jan Kara 2014-03-17 19:49 ` Jan Kara 2014-03-17 19:49 ` [PATCH 6/9] media: vb2: Convert vb2_dc_get_userptr() " Jan Kara 2014-03-17 19:49 ` Jan Kara 2014-03-17 19:49 ` [PATCH 7/9] media: vb2: Remove unused functions Jan Kara 2014-03-17 19:49 ` Jan Kara 2014-03-17 19:49 ` [PATCH 8/9] drm/exynos: Convert g2d_userptr_get_dma_addr() to use get_vaddr_pfn() Jan Kara 2014-03-17 19:49 ` Jan Kara 2014-03-17 19:49 ` [PATCH 9/9] staging: tidspbridge: Convert to get_vaddr_pfns() Jan Kara 2014-03-17 19:49 ` Jan Kara 2014-04-10 10:02 ` [RFC] Helper to abstract vma handling in media layer Marek Szyprowski 2014-04-10 10:02 ` Marek Szyprowski 2014-04-10 10:32 ` Jan Kara 2014-04-10 10:32 ` Jan Kara 2014-04-10 11:07 ` Hans Verkuil 2014-04-10 11:07 ` Hans Verkuil 2014-04-10 12:15 ` Jan Kara 2014-04-10 12:15 ` Jan Kara 2014-04-10 12:22 ` Hans Verkuil 2014-04-10 12:22 ` Hans Verkuil 2014-04-10 21:57 ` Jan Kara 2014-04-10 21:57 ` Jan Kara 2014-04-10 22:18 ` Jan Kara 2014-04-10 22:18 ` Jan Kara 2014-04-11 6:58 ` Hans Verkuil 2014-04-11 6:58 ` Hans Verkuil 2014-04-14 21:19 ` Jan Kara 2014-04-14 21:19 ` 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=1395085776-8626-3-git-send-email-jack@suse.cz \ --to=jack@suse.cz \ --cc=linux-media@vger.kernel.org \ --cc=linux-mm@kvack.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: linkBe 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.