[media] Revert "[media] vb2: Push mmap_sem down to memops"

author Hans Verkuil <hans.verkuil@cisco.com>

Mon, 15 Jun 2015 07:16:32 +0000 (04:16 -0300)

committer Mauro Carvalho Chehab <mchehab@osg.samsung.com>

Thu, 18 Jun 2015 17:34:22 +0000 (14:34 -0300)
author Hans Verkuil <hans.verkuil@cisco.com>
Mon, 15 Jun 2015 07:16:32 +0000 (04:16 -0300)
committer Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 18 Jun 2015 17:34:22 +0000 (14:34 -0300)
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c

index 1a096a62ef309d177112971f7e2cb7e62e1559d0..d835814a24d48311539a48a98f7aba07b54412a8 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -1662,7 +1662,9 @@ static int __buf_prepare(struct vb2_buffer *vb, const struct v4l2_buffer *b)
                 ret = __qbuf_mmap(vb, b);
                 break;
         case V4L2_MEMORY_USERPTR:
+               down_read(&current->mm->mmap_sem);
                 ret = __qbuf_userptr(vb, b);
+               up_read(&current->mm->mmap_sem);
                 break;
         case V4L2_MEMORY_DMABUF:
                 ret = __qbuf_dmabuf(vb, b);
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c

index 369df95af5c74fa4c5b1869763063935914c5f41..94c1e6455d365de7faa1b4b0df14ce279820d5f2 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -532,9 +532,7 @@ static void vb2_dc_put_userptr(void *buf_priv)
                 sg_free_table(sgt);
                 kfree(sgt);
         }
-       down_read(&current->mm->mmap_sem);
         vb2_put_vma(buf->vma);
-       up_read(&current->mm->mmap_sem);
         kfree(buf);
  }
  
@@ -618,7 +616,6 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
                 goto fail_buf;
         }
  
-       down_read(&current->mm->mmap_sem);
         /* current->mm->mmap_sem is taken by videobuf2 core */
         vma = find_vma(current->mm, vaddr);
         if (!vma) {
@@ -645,7 +642,6 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
         if (ret) {
                 unsigned long pfn;
                 if (vb2_dc_get_user_pfn(start, n_pages, vma, &pfn) == 0) {
-                       up_read(&current->mm->mmap_sem);
                         buf->dma_addr = vb2_dc_pfn_to_dma(buf->dev, pfn);
                         buf->size = size;
                         kfree(pages);
@@ -655,7 +651,6 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
                 pr_err("failed to get user pages\n");
                 goto fail_vma;
         }
-       up_read(&current->mm->mmap_sem);
  
         sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
         if (!sgt) {
@@ -718,12 +713,10 @@ fail_get_user_pages:
                 while (n_pages)
                         put_page(pages[--n_pages]);
  
-       down_read(&current->mm->mmap_sem);
  fail_vma:
         vb2_put_vma(buf->vma);
  
  fail_pages:
-       up_read(&current->mm->mmap_sem);
         kfree(pages); /* kfree is NULL-proof */
  
  fail_buf:
diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c

index d7bcb05c705884c24df86c25420f4584bc6cd536..7289b81bd7b72e46acf5f522a2341a31088020e4 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
@@ -264,7 +264,6 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
         if (!buf->pages)
                 goto userptr_fail_alloc_pages;
  
-       down_read(&current->mm->mmap_sem);
         vma = find_vma(current->mm, vaddr);
         if (!vma) {
                 dprintk(1, "no vma for address %lu\n", vaddr);
@@ -303,7 +302,6 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
                                              1, /* force */
                                              buf->pages,
                                              NULL);
-       up_read(&current->mm->mmap_sem);
  
         if (num_pages_from_user != buf->num_pages)
                 goto userptr_fail_get_user_pages;
@@ -333,10 +331,8 @@ userptr_fail_get_user_pages:
         if (!vma_is_io(buf->vma))
                 while (--num_pages_from_user >= 0)
                         put_page(buf->pages[num_pages_from_user]);
-       down_read(&current->mm->mmap_sem);
         vb2_put_vma(buf->vma);
  userptr_fail_find_vma:
-       up_read(&current->mm->mmap_sem);
         kfree(buf->pages);
  userptr_fail_alloc_pages:
         kfree(buf);
@@ -370,9 +366,7 @@ static void vb2_dma_sg_put_userptr(void *buf_priv)
                         put_page(buf->pages[i]);
         }
         kfree(buf->pages);
-       down_read(&current->mm->mmap_sem);
         vb2_put_vma(buf->vma);
-       up_read(&current->mm->mmap_sem);
         kfree(buf);
  }
  
diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c

index f6656fefc03545b500653cfc98a94d7dcb202953..2fe4c27f524a85d9732ba4cbc72f5979f954466f 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
@@ -89,7 +89,7 @@ static void *vb2_vmalloc_get_userptr(void *alloc_ctx, unsigned long vaddr,
         offset = vaddr & ~PAGE_MASK;
         buf->size = size;
  
-       down_read(&current->mm->mmap_sem);
+
         vma = find_vma(current->mm, vaddr);
         if (vma && (vma->vm_flags & VM_PFNMAP) && (vma->vm_pgoff)) {
                 if (vb2_get_contig_userptr(vaddr, size, &vma, &physp))
@@ -121,7 +121,6 @@ static void *vb2_vmalloc_get_userptr(void *alloc_ctx, unsigned long vaddr,
                 if (!buf->vaddr)
                         goto fail_get_user_pages;
         }
-       up_read(&current->mm->mmap_sem);
  
         buf->vaddr += offset;
         return buf;
@@ -134,7 +133,6 @@ fail_get_user_pages:
         kfree(buf->pages);
  
  fail_pages_array_alloc:
-       up_read(&current->mm->mmap_sem);
         kfree(buf);
  
         return NULL;
@@ -146,7 +144,6 @@ static void vb2_vmalloc_put_userptr(void *buf_priv)
         unsigned long vaddr = (unsigned long)buf->vaddr & PAGE_MASK;
         unsigned int i;
  
-       down_read(&current->mm->mmap_sem);
         if (buf->pages) {
                 if (vaddr)
                         vm_unmap_ram((void *)vaddr, buf->n_pages);
@@ -160,7 +157,6 @@ static void vb2_vmalloc_put_userptr(void *buf_priv)
                 vb2_put_vma(buf->vma);
                 iounmap((__force void __iomem *)buf->vaddr);
         }
-       up_read(&current->mm->mmap_sem);
         kfree(buf);
  }
author	Hans Verkuil <hans.verkuil@cisco.com>
	Mon, 15 Jun 2015 07:16:32 +0000 (04:16 -0300)
committer	Mauro Carvalho Chehab <mchehab@osg.samsung.com>
	Thu, 18 Jun 2015 17:34:22 +0000 (14:34 -0300)
drivers/media/v4l2-core/videobuf2-core.c		patch \| blob \| blame \| history
drivers/media/v4l2-core/videobuf2-dma-contig.c		patch \| blob \| blame \| history
drivers/media/v4l2-core/videobuf2-dma-sg.c		patch \| blob \| blame \| history
drivers/media/v4l2-core/videobuf2-vmalloc.c		patch \| blob \| blame \| history