From patchwork Wed Nov 2 10:52:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Pietrasiewicz X-Patchwork-Id: 8278 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RLYRH-0001VT-8s; Wed, 02 Nov 2011 11:53:00 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1RLYRG-0000Vq-Dr; Wed, 02 Nov 2011 11:52:59 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754048Ab1KBKw4 (ORCPT + 3 others); Wed, 2 Nov 2011 06:52:56 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:44729 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752143Ab1KBKw4 (ORCPT ); Wed, 2 Nov 2011 06:52:56 -0400 Received: from euspt1 (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0LU100B4Q4W5Z6@mailout1.w1.samsung.com> for linux-media@vger.kernel.org; Wed, 02 Nov 2011 10:52:54 +0000 (GMT) Received: from linux.samsung.com ([106.116.38.10]) by spt1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LU1008AJ4W5AO@spt1.w1.samsung.com> for linux-media@vger.kernel.org; Wed, 02 Nov 2011 10:52:53 +0000 (GMT) Received: from mcdsrvbld02.digital.local (unknown [106.116.37.23]) by linux.samsung.com (Postfix) with ESMTP id A2906270050; Wed, 02 Nov 2011 11:58:55 +0100 (CET) Date: Wed, 02 Nov 2011 11:52:02 +0100 From: Andrzej Pietrasiewicz Subject: [PATCH] media: vb2: vmalloc-based allocator user pointer handling To: linux-media@vger.kernel.org Cc: Andrzej Pietrasiewicz , Kyungmin Park , Marek Szyprowski , Pawel Osciak , Laurent Pinchart Message-id: <1320231122-22518-1-git-send-email-andrzej.p@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.7 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.11.2.104214 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: -4.2 (----) X-LSpam-Report: No, score=-4.2 required=5.0 tests=BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3 autolearn=ham vmalloc-based allocator user pointer handling Signed-off-by: Andrzej Pietrasiewicz Signed-off-by: Kyungmin Park --- drivers/media/video/videobuf2-vmalloc.c | 86 ++++++++++++++++++++++++++++++- 1 files changed, 85 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/videobuf2-vmalloc.c b/drivers/media/video/videobuf2-vmalloc.c index a3a8842..ee0ee37 100644 --- a/drivers/media/video/videobuf2-vmalloc.c +++ b/drivers/media/video/videobuf2-vmalloc.c @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -20,7 +21,10 @@ struct vb2_vmalloc_buf { void *vaddr; + struct page **pages; + int write; unsigned long size; + unsigned int n_pages; atomic_t refcount; struct vb2_vmarea_handler handler; }; @@ -66,6 +70,83 @@ static void vb2_vmalloc_put(void *buf_priv) } } +static void *vb2_vmalloc_get_userptr(void *alloc_ctx, unsigned long vaddr, + unsigned long size, int write) +{ + struct vb2_vmalloc_buf *buf; + + unsigned long first, last; + int n_pages_from_user, offset; + + buf = kzalloc(sizeof *buf, GFP_KERNEL); + if (!buf) + return NULL; + + buf->vaddr = NULL; + buf->write = write; + offset = vaddr & ~PAGE_MASK; + buf->size = size; + + first = (vaddr & PAGE_MASK) >> PAGE_SHIFT; + last = ((vaddr + size - 1) & PAGE_MASK) >> PAGE_SHIFT; + buf->n_pages = last - first + 1; + buf->pages = kzalloc(buf->n_pages * sizeof(struct page *), GFP_KERNEL); + if (!buf->pages) + goto userptr_fail_pages_array_alloc; + + down_read(¤t->mm->mmap_sem); + n_pages_from_user = get_user_pages(current, current->mm, + vaddr & PAGE_MASK, + buf->n_pages, + write, + 1, /* force */ + buf->pages, + NULL); + up_read(¤t->mm->mmap_sem); + if (n_pages_from_user != buf->n_pages) + goto userptr_fail_get_user_pages; + + buf->vaddr = vm_map_ram(buf->pages, buf->n_pages, -1, PAGE_KERNEL); + + if (buf->vaddr) { + buf->vaddr += offset; + return buf; + } + +userptr_fail_get_user_pages: + printk(KERN_DEBUG "get_user_pages requested/got: %d/%d]\n", + n_pages_from_user, buf->n_pages); + while (--n_pages_from_user >= 0) + put_page(buf->pages[n_pages_from_user]); + kfree(buf->pages); + +userptr_fail_pages_array_alloc: + kfree(buf); + + return NULL; +} + +static void vb2_vmalloc_put_userptr(void *buf_priv) +{ + struct vb2_vmalloc_buf *buf = buf_priv; + + int i = buf->n_pages; + int offset = (unsigned long)buf->vaddr & ~PAGE_MASK; + + printk(KERN_DEBUG "%s: Releasing userspace buffer of %d pages\n", + __func__, buf->n_pages); + if (buf->vaddr) + vm_unmap_ram((const void *)((unsigned long)buf->vaddr - offset), + buf->n_pages); + while (--i >= 0) { + if (buf->write) + set_page_dirty_lock(buf->pages[i]); + put_page(buf->pages[i]); + } + kfree(buf->pages); + kfree(buf); +} + static void *vb2_vmalloc_vaddr(void *buf_priv) { struct vb2_vmalloc_buf *buf = buf_priv; @@ -73,7 +154,8 @@ static void *vb2_vmalloc_vaddr(void *buf_priv) BUG_ON(!buf); if (!buf->vaddr) { - printk(KERN_ERR "Address of an unallocated plane requested\n"); + printk(KERN_ERR "Address of an unallocated plane requested " + "or cannot map user pointer\n"); return NULL; } @@ -121,6 +203,8 @@ static int vb2_vmalloc_mmap(void *buf_priv, struct vm_area_struct *vma) const struct vb2_mem_ops vb2_vmalloc_memops = { .alloc = vb2_vmalloc_alloc, .put = vb2_vmalloc_put, + .get_userptr = vb2_vmalloc_get_userptr, + .put_userptr = vb2_vmalloc_put_userptr, .vaddr = vb2_vmalloc_vaddr, .mmap = vb2_vmalloc_mmap, .num_users = vb2_vmalloc_num_users,