From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from cantor2.suse.de ([195.135.220.15]:59495 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965154AbbEFH2a (ORCPT ); Wed, 6 May 2015 03:28:30 -0400 From: Jan Kara To: linux-mm@kvack.org Cc: linux-media@vger.kernel.org, Hans Verkuil , dri-devel@lists.freedesktop.org, Pawel Osciak , Mauro Carvalho Chehab , mgorman@suse.de, Marek Szyprowski , linux-samsung-soc@vger.kernel.org, Jan Kara Subject: [PATCH 9/9] drm/exynos: Convert g2d_userptr_get_dma_addr() to use get_vaddr_frames() Date: Wed, 6 May 2015 09:28:16 +0200 Message-Id: <1430897296-5469-10-git-send-email-jack@suse.cz> In-Reply-To: <1430897296-5469-1-git-send-email-jack@suse.cz> References: <1430897296-5469-1-git-send-email-jack@suse.cz> Sender: linux-media-owner@vger.kernel.org List-ID: Convert g2d_userptr_get_dma_addr() to pin pages using get_vaddr_frames(). This removes the knowledge about vmas and mmap_sem locking from exynos driver. Also it fixes a problem that the function has been mapping user provided address without holding mmap_sem. Signed-off-by: Jan Kara --- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 89 ++++++++++-------------------- drivers/gpu/drm/exynos/exynos_drm_gem.c | 97 --------------------------------- 2 files changed, 29 insertions(+), 157 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index 81a250830808..265519c0fe2d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c @@ -190,10 +190,8 @@ struct g2d_cmdlist_userptr { dma_addr_t dma_addr; unsigned long userptr; unsigned long size; - struct page **pages; - unsigned int npages; + struct frame_vector *vec; struct sg_table *sgt; - struct vm_area_struct *vma; atomic_t refcount; bool in_pool; bool out_of_list; @@ -363,6 +361,7 @@ static void g2d_userptr_put_dma_addr(struct drm_device *drm_dev, { struct g2d_cmdlist_userptr *g2d_userptr = (struct g2d_cmdlist_userptr *)obj; + struct page **pages; if (!obj) return; @@ -382,19 +381,21 @@ out: exynos_gem_unmap_sgt_from_dma(drm_dev, g2d_userptr->sgt, DMA_BIDIRECTIONAL); - exynos_gem_put_pages_to_userptr(g2d_userptr->pages, - g2d_userptr->npages, - g2d_userptr->vma); + pages = frame_vector_pages(g2d_userptr->vec); + if (!IS_ERR(pages)) { + int i; - exynos_gem_put_vma(g2d_userptr->vma); + for (i = 0; i < frame_vector_count(g2d_userptr->vec); i++) + set_page_dirty_lock(pages[i]); + } + put_vaddr_frames(g2d_userptr->vec); + frame_vector_destroy(g2d_userptr->vec); if (!g2d_userptr->out_of_list) list_del_init(&g2d_userptr->list); sg_free_table(g2d_userptr->sgt); kfree(g2d_userptr->sgt); - - drm_free_large(g2d_userptr->pages); kfree(g2d_userptr); } @@ -413,6 +414,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev, struct vm_area_struct *vma; unsigned long start, end; unsigned int npages, offset; + struct frame_vector *vec; int ret; if (!size) { @@ -456,65 +458,37 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev, return ERR_PTR(-ENOMEM); atomic_set(&g2d_userptr->refcount, 1); + g2d_userptr->size = size; start = userptr & PAGE_MASK; offset = userptr & ~PAGE_MASK; end = PAGE_ALIGN(userptr + size); npages = (end - start) >> PAGE_SHIFT; - g2d_userptr->npages = npages; - - pages = drm_calloc_large(npages, sizeof(struct page *)); - if (!pages) { - DRM_ERROR("failed to allocate pages.\n"); - ret = -ENOMEM; + vec = g2d_userptr->vec = frame_vector_create(npages); + if (!vec) goto err_free; - } - down_read(¤t->mm->mmap_sem); - vma = find_vma(current->mm, userptr); - if (!vma) { - up_read(¤t->mm->mmap_sem); - DRM_ERROR("failed to get vm region.\n"); + ret = get_vaddr_frames(start, npages, 1, 1, vec); + if (ret != npages) { + DRM_ERROR("failed to get user pages from userptr.\n"); + if (ret < 0) + goto err_destroy_framevec; ret = -EFAULT; - goto err_free_pages; + goto err_put_framevec; } - - if (vma->vm_end < userptr + size) { - up_read(¤t->mm->mmap_sem); - DRM_ERROR("vma is too small.\n"); + if (frame_vector_to_pages(vec) < 0) { ret = -EFAULT; - goto err_free_pages; + goto err_put_framevec; } - g2d_userptr->vma = exynos_gem_get_vma(vma); - if (!g2d_userptr->vma) { - up_read(¤t->mm->mmap_sem); - DRM_ERROR("failed to copy vma.\n"); - ret = -ENOMEM; - goto err_free_pages; - } - - g2d_userptr->size = size; - - ret = exynos_gem_get_pages_from_userptr(start & PAGE_MASK, - npages, pages, vma); - if (ret < 0) { - up_read(¤t->mm->mmap_sem); - DRM_ERROR("failed to get user pages from userptr.\n"); - goto err_put_vma; - } - - up_read(¤t->mm->mmap_sem); - g2d_userptr->pages = pages; - sgt = kzalloc(sizeof(*sgt), GFP_KERNEL); if (!sgt) { ret = -ENOMEM; - goto err_free_userptr; + goto err_put_framevec; } - ret = sg_alloc_table_from_pages(sgt, pages, npages, offset, - size, GFP_KERNEL); + ret = sg_alloc_table_from_pages(sgt, frame_vector_pages(vec), npages, + offset, size, GFP_KERNEL); if (ret < 0) { DRM_ERROR("failed to get sgt from pages.\n"); goto err_free_sgt; @@ -549,16 +523,11 @@ err_sg_free_table: err_free_sgt: kfree(sgt); -err_free_userptr: - exynos_gem_put_pages_to_userptr(g2d_userptr->pages, - g2d_userptr->npages, - g2d_userptr->vma); - -err_put_vma: - exynos_gem_put_vma(g2d_userptr->vma); +err_put_framevec: + put_vaddr_frames(vec); -err_free_pages: - drm_free_large(pages); +err_destroy_framevec: + frame_vector_destroy(vec); err_free: kfree(g2d_userptr); diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 0d5b9698d384..47068ae44ced 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -378,103 +378,6 @@ int exynos_drm_gem_get_ioctl(struct drm_device *dev, void *data, return 0; } -struct vm_area_struct *exynos_gem_get_vma(struct vm_area_struct *vma) -{ - struct vm_area_struct *vma_copy; - - vma_copy = kmalloc(sizeof(*vma_copy), GFP_KERNEL); - if (!vma_copy) - return NULL; - - if (vma->vm_ops && vma->vm_ops->open) - vma->vm_ops->open(vma); - - if (vma->vm_file) - get_file(vma->vm_file); - - memcpy(vma_copy, vma, sizeof(*vma)); - - vma_copy->vm_mm = NULL; - vma_copy->vm_next = NULL; - vma_copy->vm_prev = NULL; - - return vma_copy; -} - -void exynos_gem_put_vma(struct vm_area_struct *vma) -{ - if (!vma) - return; - - if (vma->vm_ops && vma->vm_ops->close) - vma->vm_ops->close(vma); - - if (vma->vm_file) - fput(vma->vm_file); - - kfree(vma); -} - -int exynos_gem_get_pages_from_userptr(unsigned long start, - unsigned int npages, - struct page **pages, - struct vm_area_struct *vma) -{ - int get_npages; - - /* the memory region mmaped with VM_PFNMAP. */ - if (vma_is_io(vma)) { - unsigned int i; - - for (i = 0; i < npages; ++i, start += PAGE_SIZE) { - unsigned long pfn; - int ret = follow_pfn(vma, start, &pfn); - if (ret) - return ret; - - pages[i] = pfn_to_page(pfn); - } - - if (i != npages) { - DRM_ERROR("failed to get user_pages.\n"); - return -EINVAL; - } - - return 0; - } - - get_npages = get_user_pages(current, current->mm, start, - npages, 1, 1, pages, NULL); - get_npages = max(get_npages, 0); - if (get_npages != npages) { - DRM_ERROR("failed to get user_pages.\n"); - while (get_npages) - put_page(pages[--get_npages]); - return -EFAULT; - } - - return 0; -} - -void exynos_gem_put_pages_to_userptr(struct page **pages, - unsigned int npages, - struct vm_area_struct *vma) -{ - if (!vma_is_io(vma)) { - unsigned int i; - - for (i = 0; i < npages; i++) { - set_page_dirty_lock(pages[i]); - - /* - * undo the reference we took when populating - * the table. - */ - put_page(pages[i]); - } - } -} - int exynos_gem_map_sgt_with_dma(struct drm_device *drm_dev, struct sg_table *sgt, enum dma_data_direction dir) -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Subject: [PATCH 9/9] drm/exynos: Convert g2d_userptr_get_dma_addr() to use get_vaddr_frames() Date: Wed, 6 May 2015 09:28:16 +0200 Message-ID: <1430897296-5469-10-git-send-email-jack@suse.cz> References: <1430897296-5469-1-git-send-email-jack@suse.cz> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1430897296-5469-1-git-send-email-jack@suse.cz> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-mm@kvack.org Cc: linux-samsung-soc@vger.kernel.org, Jan Kara , Pawel Osciak , Mauro Carvalho Chehab , dri-devel@lists.freedesktop.org, mgorman@suse.de, Marek Szyprowski , linux-media@vger.kernel.org List-Id: linux-samsung-soc@vger.kernel.org Q29udmVydCBnMmRfdXNlcnB0cl9nZXRfZG1hX2FkZHIoKSB0byBwaW4gcGFnZXMgdXNpbmcgZ2V0 X3ZhZGRyX2ZyYW1lcygpLgpUaGlzIHJlbW92ZXMgdGhlIGtub3dsZWRnZSBhYm91dCB2bWFzIGFu ZCBtbWFwX3NlbSBsb2NraW5nIGZyb20gZXh5bm9zCmRyaXZlci4gQWxzbyBpdCBmaXhlcyBhIHBy b2JsZW0gdGhhdCB0aGUgZnVuY3Rpb24gaGFzIGJlZW4gbWFwcGluZyB1c2VyCnByb3ZpZGVkIGFk ZHJlc3Mgd2l0aG91dCBob2xkaW5nIG1tYXBfc2VtLgoKU2lnbmVkLW9mZi1ieTogSmFuIEthcmEg PGphY2tAc3VzZS5jej4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZzJk LmMgfCA4OSArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9l eHlub3MvZXh5bm9zX2RybV9nZW0uYyB8IDk3IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAxNTcgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2cyZC5jIGIv ZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2cyZC5jCmluZGV4IDgxYTI1MDgzMDgw OC4uMjY1NTE5YzBmZTJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5v c19kcm1fZzJkLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2cyZC5j CkBAIC0xOTAsMTAgKzE5MCw4IEBAIHN0cnVjdCBnMmRfY21kbGlzdF91c2VycHRyIHsKIAlkbWFf YWRkcl90CQlkbWFfYWRkcjsKIAl1bnNpZ25lZCBsb25nCQl1c2VycHRyOwogCXVuc2lnbmVkIGxv bmcJCXNpemU7Ci0Jc3RydWN0IHBhZ2UJCSoqcGFnZXM7Ci0JdW5zaWduZWQgaW50CQlucGFnZXM7 CisJc3RydWN0IGZyYW1lX3ZlY3RvcgkqdmVjOwogCXN0cnVjdCBzZ190YWJsZQkJKnNndDsKLQlz dHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QJKnZtYTsKIAlhdG9taWNfdAkJcmVmY291bnQ7CiAJYm9vbAkJ CWluX3Bvb2w7CiAJYm9vbAkJCW91dF9vZl9saXN0OwpAQCAtMzYzLDYgKzM2MSw3IEBAIHN0YXRp YyB2b2lkIGcyZF91c2VycHRyX3B1dF9kbWFfYWRkcihzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2Rl diwKIHsKIAlzdHJ1Y3QgZzJkX2NtZGxpc3RfdXNlcnB0ciAqZzJkX3VzZXJwdHIgPQogCQkJCQko c3RydWN0IGcyZF9jbWRsaXN0X3VzZXJwdHIgKilvYmo7CisJc3RydWN0IHBhZ2UgKipwYWdlczsK IAogCWlmICghb2JqKQogCQlyZXR1cm47CkBAIC0zODIsMTkgKzM4MSwyMSBAQCBvdXQ6CiAJZXh5 bm9zX2dlbV91bm1hcF9zZ3RfZnJvbV9kbWEoZHJtX2RldiwgZzJkX3VzZXJwdHItPnNndCwKIAkJ CQkJRE1BX0JJRElSRUNUSU9OQUwpOwogCi0JZXh5bm9zX2dlbV9wdXRfcGFnZXNfdG9fdXNlcnB0 cihnMmRfdXNlcnB0ci0+cGFnZXMsCi0JCQkJCWcyZF91c2VycHRyLT5ucGFnZXMsCi0JCQkJCWcy ZF91c2VycHRyLT52bWEpOworCXBhZ2VzID0gZnJhbWVfdmVjdG9yX3BhZ2VzKGcyZF91c2VycHRy LT52ZWMpOworCWlmICghSVNfRVJSKHBhZ2VzKSkgeworCQlpbnQgaTsKIAotCWV4eW5vc19nZW1f cHV0X3ZtYShnMmRfdXNlcnB0ci0+dm1hKTsKKwkJZm9yIChpID0gMDsgaSA8IGZyYW1lX3ZlY3Rv cl9jb3VudChnMmRfdXNlcnB0ci0+dmVjKTsgaSsrKQorCQkJc2V0X3BhZ2VfZGlydHlfbG9jayhw YWdlc1tpXSk7CisJfQorCXB1dF92YWRkcl9mcmFtZXMoZzJkX3VzZXJwdHItPnZlYyk7CisJZnJh bWVfdmVjdG9yX2Rlc3Ryb3koZzJkX3VzZXJwdHItPnZlYyk7CiAKIAlpZiAoIWcyZF91c2VycHRy LT5vdXRfb2ZfbGlzdCkKIAkJbGlzdF9kZWxfaW5pdCgmZzJkX3VzZXJwdHItPmxpc3QpOwogCiAJ c2dfZnJlZV90YWJsZShnMmRfdXNlcnB0ci0+c2d0KTsKIAlrZnJlZShnMmRfdXNlcnB0ci0+c2d0 KTsKLQotCWRybV9mcmVlX2xhcmdlKGcyZF91c2VycHRyLT5wYWdlcyk7CiAJa2ZyZWUoZzJkX3Vz ZXJwdHIpOwogfQogCkBAIC00MTMsNiArNDE0LDcgQEAgc3RhdGljIGRtYV9hZGRyX3QgKmcyZF91 c2VycHRyX2dldF9kbWFfYWRkcihzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2RldiwKIAlzdHJ1Y3Qg dm1fYXJlYV9zdHJ1Y3QgKnZtYTsKIAl1bnNpZ25lZCBsb25nIHN0YXJ0LCBlbmQ7CiAJdW5zaWdu ZWQgaW50IG5wYWdlcywgb2Zmc2V0OworCXN0cnVjdCBmcmFtZV92ZWN0b3IgKnZlYzsKIAlpbnQg cmV0OwogCiAJaWYgKCFzaXplKSB7CkBAIC00NTYsNjUgKzQ1OCwzNyBAQCBzdGF0aWMgZG1hX2Fk ZHJfdCAqZzJkX3VzZXJwdHJfZ2V0X2RtYV9hZGRyKHN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2 LAogCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKIAogCWF0b21pY19zZXQoJmcyZF91c2VycHRy LT5yZWZjb3VudCwgMSk7CisJZzJkX3VzZXJwdHItPnNpemUgPSBzaXplOwogCiAJc3RhcnQgPSB1 c2VycHRyICYgUEFHRV9NQVNLOwogCW9mZnNldCA9IHVzZXJwdHIgJiB+UEFHRV9NQVNLOwogCWVu ZCA9IFBBR0VfQUxJR04odXNlcnB0ciArIHNpemUpOwogCW5wYWdlcyA9IChlbmQgLSBzdGFydCkg Pj4gUEFHRV9TSElGVDsKLQlnMmRfdXNlcnB0ci0+bnBhZ2VzID0gbnBhZ2VzOwotCi0JcGFnZXMg PSBkcm1fY2FsbG9jX2xhcmdlKG5wYWdlcywgc2l6ZW9mKHN0cnVjdCBwYWdlICopKTsKLQlpZiAo IXBhZ2VzKSB7Ci0JCURSTV9FUlJPUigiZmFpbGVkIHRvIGFsbG9jYXRlIHBhZ2VzLlxuIik7Ci0J CXJldCA9IC1FTk9NRU07CisJdmVjID0gZzJkX3VzZXJwdHItPnZlYyA9IGZyYW1lX3ZlY3Rvcl9j cmVhdGUobnBhZ2VzKTsKKwlpZiAoIXZlYykKIAkJZ290byBlcnJfZnJlZTsKLQl9CiAKLQlkb3du X3JlYWQoJmN1cnJlbnQtPm1tLT5tbWFwX3NlbSk7Ci0Jdm1hID0gZmluZF92bWEoY3VycmVudC0+ bW0sIHVzZXJwdHIpOwotCWlmICghdm1hKSB7Ci0JCXVwX3JlYWQoJmN1cnJlbnQtPm1tLT5tbWFw X3NlbSk7Ci0JCURSTV9FUlJPUigiZmFpbGVkIHRvIGdldCB2bSByZWdpb24uXG4iKTsKKwlyZXQg PSBnZXRfdmFkZHJfZnJhbWVzKHN0YXJ0LCBucGFnZXMsIDEsIDEsIHZlYyk7CisJaWYgKHJldCAh PSBucGFnZXMpIHsKKwkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gZ2V0IHVzZXIgcGFnZXMgZnJvbSB1 c2VycHRyLlxuIik7CisJCWlmIChyZXQgPCAwKQorCQkJZ290byBlcnJfZGVzdHJveV9mcmFtZXZl YzsKIAkJcmV0ID0gLUVGQVVMVDsKLQkJZ290byBlcnJfZnJlZV9wYWdlczsKKwkJZ290byBlcnJf cHV0X2ZyYW1ldmVjOwogCX0KLQotCWlmICh2bWEtPnZtX2VuZCA8IHVzZXJwdHIgKyBzaXplKSB7 Ci0JCXVwX3JlYWQoJmN1cnJlbnQtPm1tLT5tbWFwX3NlbSk7Ci0JCURSTV9FUlJPUigidm1hIGlz IHRvbyBzbWFsbC5cbiIpOworCWlmIChmcmFtZV92ZWN0b3JfdG9fcGFnZXModmVjKSA8IDApIHsK IAkJcmV0ID0gLUVGQVVMVDsKLQkJZ290byBlcnJfZnJlZV9wYWdlczsKKwkJZ290byBlcnJfcHV0 X2ZyYW1ldmVjOwogCX0KIAotCWcyZF91c2VycHRyLT52bWEgPSBleHlub3NfZ2VtX2dldF92bWEo dm1hKTsKLQlpZiAoIWcyZF91c2VycHRyLT52bWEpIHsKLQkJdXBfcmVhZCgmY3VycmVudC0+bW0t Pm1tYXBfc2VtKTsKLQkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gY29weSB2bWEuXG4iKTsKLQkJcmV0 ID0gLUVOT01FTTsKLQkJZ290byBlcnJfZnJlZV9wYWdlczsKLQl9Ci0KLQlnMmRfdXNlcnB0ci0+ c2l6ZSA9IHNpemU7Ci0KLQlyZXQgPSBleHlub3NfZ2VtX2dldF9wYWdlc19mcm9tX3VzZXJwdHIo c3RhcnQgJiBQQUdFX01BU0ssCi0JCQkJCQlucGFnZXMsIHBhZ2VzLCB2bWEpOwotCWlmIChyZXQg PCAwKSB7Ci0JCXVwX3JlYWQoJmN1cnJlbnQtPm1tLT5tbWFwX3NlbSk7Ci0JCURSTV9FUlJPUigi ZmFpbGVkIHRvIGdldCB1c2VyIHBhZ2VzIGZyb20gdXNlcnB0ci5cbiIpOwotCQlnb3RvIGVycl9w dXRfdm1hOwotCX0KLQotCXVwX3JlYWQoJmN1cnJlbnQtPm1tLT5tbWFwX3NlbSk7Ci0JZzJkX3Vz ZXJwdHItPnBhZ2VzID0gcGFnZXM7Ci0KIAlzZ3QgPSBremFsbG9jKHNpemVvZigqc2d0KSwgR0ZQ X0tFUk5FTCk7CiAJaWYgKCFzZ3QpIHsKIAkJcmV0ID0gLUVOT01FTTsKLQkJZ290byBlcnJfZnJl ZV91c2VycHRyOworCQlnb3RvIGVycl9wdXRfZnJhbWV2ZWM7CiAJfQogCi0JcmV0ID0gc2dfYWxs b2NfdGFibGVfZnJvbV9wYWdlcyhzZ3QsIHBhZ2VzLCBucGFnZXMsIG9mZnNldCwKLQkJCQkJc2l6 ZSwgR0ZQX0tFUk5FTCk7CisJcmV0ID0gc2dfYWxsb2NfdGFibGVfZnJvbV9wYWdlcyhzZ3QsIGZy YW1lX3ZlY3Rvcl9wYWdlcyh2ZWMpLCBucGFnZXMsCisJCQkJCW9mZnNldCwgc2l6ZSwgR0ZQX0tF Uk5FTCk7CiAJaWYgKHJldCA8IDApIHsKIAkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gZ2V0IHNndCBm cm9tIHBhZ2VzLlxuIik7CiAJCWdvdG8gZXJyX2ZyZWVfc2d0OwpAQCAtNTQ5LDE2ICs1MjMsMTEg QEAgZXJyX3NnX2ZyZWVfdGFibGU6CiBlcnJfZnJlZV9zZ3Q6CiAJa2ZyZWUoc2d0KTsKIAotZXJy X2ZyZWVfdXNlcnB0cjoKLQlleHlub3NfZ2VtX3B1dF9wYWdlc190b191c2VycHRyKGcyZF91c2Vy cHRyLT5wYWdlcywKLQkJCQkJZzJkX3VzZXJwdHItPm5wYWdlcywKLQkJCQkJZzJkX3VzZXJwdHIt PnZtYSk7Ci0KLWVycl9wdXRfdm1hOgotCWV4eW5vc19nZW1fcHV0X3ZtYShnMmRfdXNlcnB0ci0+ dm1hKTsKK2Vycl9wdXRfZnJhbWV2ZWM6CisJcHV0X3ZhZGRyX2ZyYW1lcyh2ZWMpOwogCi1lcnJf ZnJlZV9wYWdlczoKLQlkcm1fZnJlZV9sYXJnZShwYWdlcyk7CitlcnJfZGVzdHJveV9mcmFtZXZl YzoKKwlmcmFtZV92ZWN0b3JfZGVzdHJveSh2ZWMpOwogCiBlcnJfZnJlZToKIAlrZnJlZShnMmRf dXNlcnB0cik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1f Z2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZ2VtLmMKaW5kZXggMGQ1 Yjk2OThkMzg0Li40NzA2OGFlNDRjZWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9leHlu b3MvZXh5bm9zX2RybV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19k cm1fZ2VtLmMKQEAgLTM3OCwxMDMgKzM3OCw2IEBAIGludCBleHlub3NfZHJtX2dlbV9nZXRfaW9j dGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlyZXR1cm4gMDsKIH0KIAot c3RydWN0IHZtX2FyZWFfc3RydWN0ICpleHlub3NfZ2VtX2dldF92bWEoc3RydWN0IHZtX2FyZWFf c3RydWN0ICp2bWEpCi17Ci0Jc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWFfY29weTsKLQotCXZt YV9jb3B5ID0ga21hbGxvYyhzaXplb2YoKnZtYV9jb3B5KSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKCF2 bWFfY29weSkKLQkJcmV0dXJuIE5VTEw7Ci0KLQlpZiAodm1hLT52bV9vcHMgJiYgdm1hLT52bV9v cHMtPm9wZW4pCi0JCXZtYS0+dm1fb3BzLT5vcGVuKHZtYSk7Ci0KLQlpZiAodm1hLT52bV9maWxl KQotCQlnZXRfZmlsZSh2bWEtPnZtX2ZpbGUpOwotCi0JbWVtY3B5KHZtYV9jb3B5LCB2bWEsIHNp emVvZigqdm1hKSk7Ci0KLQl2bWFfY29weS0+dm1fbW0gPSBOVUxMOwotCXZtYV9jb3B5LT52bV9u ZXh0ID0gTlVMTDsKLQl2bWFfY29weS0+dm1fcHJldiA9IE5VTEw7Ci0KLQlyZXR1cm4gdm1hX2Nv cHk7Ci19Ci0KLXZvaWQgZXh5bm9zX2dlbV9wdXRfdm1hKHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAq dm1hKQotewotCWlmICghdm1hKQotCQlyZXR1cm47Ci0KLQlpZiAodm1hLT52bV9vcHMgJiYgdm1h LT52bV9vcHMtPmNsb3NlKQotCQl2bWEtPnZtX29wcy0+Y2xvc2Uodm1hKTsKLQotCWlmICh2bWEt PnZtX2ZpbGUpCi0JCWZwdXQodm1hLT52bV9maWxlKTsKLQotCWtmcmVlKHZtYSk7Ci19Ci0KLWlu dCBleHlub3NfZ2VtX2dldF9wYWdlc19mcm9tX3VzZXJwdHIodW5zaWduZWQgbG9uZyBzdGFydCwK LQkJCQkJCXVuc2lnbmVkIGludCBucGFnZXMsCi0JCQkJCQlzdHJ1Y3QgcGFnZSAqKnBhZ2VzLAot CQkJCQkJc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEpCi17Ci0JaW50IGdldF9ucGFnZXM7Ci0K LQkvKiB0aGUgbWVtb3J5IHJlZ2lvbiBtbWFwZWQgd2l0aCBWTV9QRk5NQVAuICovCi0JaWYgKHZt YV9pc19pbyh2bWEpKSB7Ci0JCXVuc2lnbmVkIGludCBpOwotCi0JCWZvciAoaSA9IDA7IGkgPCBu cGFnZXM7ICsraSwgc3RhcnQgKz0gUEFHRV9TSVpFKSB7Ci0JCQl1bnNpZ25lZCBsb25nIHBmbjsK LQkJCWludCByZXQgPSBmb2xsb3dfcGZuKHZtYSwgc3RhcnQsICZwZm4pOwotCQkJaWYgKHJldCkK LQkJCQlyZXR1cm4gcmV0OwotCi0JCQlwYWdlc1tpXSA9IHBmbl90b19wYWdlKHBmbik7Ci0JCX0K LQotCQlpZiAoaSAhPSBucGFnZXMpIHsKLQkJCURSTV9FUlJPUigiZmFpbGVkIHRvIGdldCB1c2Vy X3BhZ2VzLlxuIik7Ci0JCQlyZXR1cm4gLUVJTlZBTDsKLQkJfQotCi0JCXJldHVybiAwOwotCX0K LQotCWdldF9ucGFnZXMgPSBnZXRfdXNlcl9wYWdlcyhjdXJyZW50LCBjdXJyZW50LT5tbSwgc3Rh cnQsCi0JCQkJCW5wYWdlcywgMSwgMSwgcGFnZXMsIE5VTEwpOwotCWdldF9ucGFnZXMgPSBtYXgo Z2V0X25wYWdlcywgMCk7Ci0JaWYgKGdldF9ucGFnZXMgIT0gbnBhZ2VzKSB7Ci0JCURSTV9FUlJP UigiZmFpbGVkIHRvIGdldCB1c2VyX3BhZ2VzLlxuIik7Ci0JCXdoaWxlIChnZXRfbnBhZ2VzKQot CQkJcHV0X3BhZ2UocGFnZXNbLS1nZXRfbnBhZ2VzXSk7Ci0JCXJldHVybiAtRUZBVUxUOwotCX0K LQotCXJldHVybiAwOwotfQotCi12b2lkIGV4eW5vc19nZW1fcHV0X3BhZ2VzX3RvX3VzZXJwdHIo c3RydWN0IHBhZ2UgKipwYWdlcywKLQkJCQkJdW5zaWduZWQgaW50IG5wYWdlcywKLQkJCQkJc3Ry dWN0IHZtX2FyZWFfc3RydWN0ICp2bWEpCi17Ci0JaWYgKCF2bWFfaXNfaW8odm1hKSkgewotCQl1 bnNpZ25lZCBpbnQgaTsKLQotCQlmb3IgKGkgPSAwOyBpIDwgbnBhZ2VzOyBpKyspIHsKLQkJCXNl dF9wYWdlX2RpcnR5X2xvY2socGFnZXNbaV0pOwotCi0JCQkvKgotCQkJICogdW5kbyB0aGUgcmVm ZXJlbmNlIHdlIHRvb2sgd2hlbiBwb3B1bGF0aW5nCi0JCQkgKiB0aGUgdGFibGUuCi0JCQkgKi8K LQkJCXB1dF9wYWdlKHBhZ2VzW2ldKTsKLQkJfQotCX0KLX0KLQogaW50IGV4eW5vc19nZW1fbWFw X3NndF93aXRoX2RtYShzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2RldiwKIAkJCQlzdHJ1Y3Qgc2df dGFibGUgKnNndCwKIAkJCQllbnVtIGRtYV9kYXRhX2RpcmVjdGlvbiBkaXIpCi0tIAoyLjEuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by kanga.kvack.org (Postfix) with ESMTP id 63CA86B0082 for ; Wed, 6 May 2015 03:28:45 -0400 (EDT) Received: by wgyo15 with SMTP id o15so1738636wgy.2 for ; Wed, 06 May 2015 00:28:44 -0700 (PDT) Received: from mx2.suse.de (cantor2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id ym6si32515786wjc.130.2015.05.06.00.28.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 May 2015 00:28:27 -0700 (PDT) From: Jan Kara Subject: [PATCH 9/9] drm/exynos: Convert g2d_userptr_get_dma_addr() to use get_vaddr_frames() Date: Wed, 6 May 2015 09:28:16 +0200 Message-Id: <1430897296-5469-10-git-send-email-jack@suse.cz> In-Reply-To: <1430897296-5469-1-git-send-email-jack@suse.cz> References: <1430897296-5469-1-git-send-email-jack@suse.cz> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: linux-media@vger.kernel.org, Hans Verkuil , dri-devel@lists.freedesktop.org, Pawel Osciak , Mauro Carvalho Chehab , mgorman@suse.de, Marek Szyprowski , linux-samsung-soc@vger.kernel.org, Jan Kara Convert g2d_userptr_get_dma_addr() to pin pages using get_vaddr_frames(). This removes the knowledge about vmas and mmap_sem locking from exynos driver. Also it fixes a problem that the function has been mapping user provided address without holding mmap_sem. Signed-off-by: Jan Kara --- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 89 ++++++++++-------------------- drivers/gpu/drm/exynos/exynos_drm_gem.c | 97 --------------------------------- 2 files changed, 29 insertions(+), 157 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index 81a250830808..265519c0fe2d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c @@ -190,10 +190,8 @@ struct g2d_cmdlist_userptr { dma_addr_t dma_addr; unsigned long userptr; unsigned long size; - struct page **pages; - unsigned int npages; + struct frame_vector *vec; struct sg_table *sgt; - struct vm_area_struct *vma; atomic_t refcount; bool in_pool; bool out_of_list; @@ -363,6 +361,7 @@ static void g2d_userptr_put_dma_addr(struct drm_device *drm_dev, { struct g2d_cmdlist_userptr *g2d_userptr = (struct g2d_cmdlist_userptr *)obj; + struct page **pages; if (!obj) return; @@ -382,19 +381,21 @@ out: exynos_gem_unmap_sgt_from_dma(drm_dev, g2d_userptr->sgt, DMA_BIDIRECTIONAL); - exynos_gem_put_pages_to_userptr(g2d_userptr->pages, - g2d_userptr->npages, - g2d_userptr->vma); + pages = frame_vector_pages(g2d_userptr->vec); + if (!IS_ERR(pages)) { + int i; - exynos_gem_put_vma(g2d_userptr->vma); + for (i = 0; i < frame_vector_count(g2d_userptr->vec); i++) + set_page_dirty_lock(pages[i]); + } + put_vaddr_frames(g2d_userptr->vec); + frame_vector_destroy(g2d_userptr->vec); if (!g2d_userptr->out_of_list) list_del_init(&g2d_userptr->list); sg_free_table(g2d_userptr->sgt); kfree(g2d_userptr->sgt); - - drm_free_large(g2d_userptr->pages); kfree(g2d_userptr); } @@ -413,6 +414,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev, struct vm_area_struct *vma; unsigned long start, end; unsigned int npages, offset; + struct frame_vector *vec; int ret; if (!size) { @@ -456,65 +458,37 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev, return ERR_PTR(-ENOMEM); atomic_set(&g2d_userptr->refcount, 1); + g2d_userptr->size = size; start = userptr & PAGE_MASK; offset = userptr & ~PAGE_MASK; end = PAGE_ALIGN(userptr + size); npages = (end - start) >> PAGE_SHIFT; - g2d_userptr->npages = npages; - - pages = drm_calloc_large(npages, sizeof(struct page *)); - if (!pages) { - DRM_ERROR("failed to allocate pages.\n"); - ret = -ENOMEM; + vec = g2d_userptr->vec = frame_vector_create(npages); + if (!vec) goto err_free; - } - down_read(¤t->mm->mmap_sem); - vma = find_vma(current->mm, userptr); - if (!vma) { - up_read(¤t->mm->mmap_sem); - DRM_ERROR("failed to get vm region.\n"); + ret = get_vaddr_frames(start, npages, 1, 1, vec); + if (ret != npages) { + DRM_ERROR("failed to get user pages from userptr.\n"); + if (ret < 0) + goto err_destroy_framevec; ret = -EFAULT; - goto err_free_pages; + goto err_put_framevec; } - - if (vma->vm_end < userptr + size) { - up_read(¤t->mm->mmap_sem); - DRM_ERROR("vma is too small.\n"); + if (frame_vector_to_pages(vec) < 0) { ret = -EFAULT; - goto err_free_pages; + goto err_put_framevec; } - g2d_userptr->vma = exynos_gem_get_vma(vma); - if (!g2d_userptr->vma) { - up_read(¤t->mm->mmap_sem); - DRM_ERROR("failed to copy vma.\n"); - ret = -ENOMEM; - goto err_free_pages; - } - - g2d_userptr->size = size; - - ret = exynos_gem_get_pages_from_userptr(start & PAGE_MASK, - npages, pages, vma); - if (ret < 0) { - up_read(¤t->mm->mmap_sem); - DRM_ERROR("failed to get user pages from userptr.\n"); - goto err_put_vma; - } - - up_read(¤t->mm->mmap_sem); - g2d_userptr->pages = pages; - sgt = kzalloc(sizeof(*sgt), GFP_KERNEL); if (!sgt) { ret = -ENOMEM; - goto err_free_userptr; + goto err_put_framevec; } - ret = sg_alloc_table_from_pages(sgt, pages, npages, offset, - size, GFP_KERNEL); + ret = sg_alloc_table_from_pages(sgt, frame_vector_pages(vec), npages, + offset, size, GFP_KERNEL); if (ret < 0) { DRM_ERROR("failed to get sgt from pages.\n"); goto err_free_sgt; @@ -549,16 +523,11 @@ err_sg_free_table: err_free_sgt: kfree(sgt); -err_free_userptr: - exynos_gem_put_pages_to_userptr(g2d_userptr->pages, - g2d_userptr->npages, - g2d_userptr->vma); - -err_put_vma: - exynos_gem_put_vma(g2d_userptr->vma); +err_put_framevec: + put_vaddr_frames(vec); -err_free_pages: - drm_free_large(pages); +err_destroy_framevec: + frame_vector_destroy(vec); err_free: kfree(g2d_userptr); diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 0d5b9698d384..47068ae44ced 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -378,103 +378,6 @@ int exynos_drm_gem_get_ioctl(struct drm_device *dev, void *data, return 0; } -struct vm_area_struct *exynos_gem_get_vma(struct vm_area_struct *vma) -{ - struct vm_area_struct *vma_copy; - - vma_copy = kmalloc(sizeof(*vma_copy), GFP_KERNEL); - if (!vma_copy) - return NULL; - - if (vma->vm_ops && vma->vm_ops->open) - vma->vm_ops->open(vma); - - if (vma->vm_file) - get_file(vma->vm_file); - - memcpy(vma_copy, vma, sizeof(*vma)); - - vma_copy->vm_mm = NULL; - vma_copy->vm_next = NULL; - vma_copy->vm_prev = NULL; - - return vma_copy; -} - -void exynos_gem_put_vma(struct vm_area_struct *vma) -{ - if (!vma) - return; - - if (vma->vm_ops && vma->vm_ops->close) - vma->vm_ops->close(vma); - - if (vma->vm_file) - fput(vma->vm_file); - - kfree(vma); -} - -int exynos_gem_get_pages_from_userptr(unsigned long start, - unsigned int npages, - struct page **pages, - struct vm_area_struct *vma) -{ - int get_npages; - - /* the memory region mmaped with VM_PFNMAP. */ - if (vma_is_io(vma)) { - unsigned int i; - - for (i = 0; i < npages; ++i, start += PAGE_SIZE) { - unsigned long pfn; - int ret = follow_pfn(vma, start, &pfn); - if (ret) - return ret; - - pages[i] = pfn_to_page(pfn); - } - - if (i != npages) { - DRM_ERROR("failed to get user_pages.\n"); - return -EINVAL; - } - - return 0; - } - - get_npages = get_user_pages(current, current->mm, start, - npages, 1, 1, pages, NULL); - get_npages = max(get_npages, 0); - if (get_npages != npages) { - DRM_ERROR("failed to get user_pages.\n"); - while (get_npages) - put_page(pages[--get_npages]); - return -EFAULT; - } - - return 0; -} - -void exynos_gem_put_pages_to_userptr(struct page **pages, - unsigned int npages, - struct vm_area_struct *vma) -{ - if (!vma_is_io(vma)) { - unsigned int i; - - for (i = 0; i < npages; i++) { - set_page_dirty_lock(pages[i]); - - /* - * undo the reference we took when populating - * the table. - */ - put_page(pages[i]); - } - } -} - int exynos_gem_map_sgt_with_dma(struct drm_device *drm_dev, struct sg_table *sgt, enum dma_data_direction dir) -- 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: email@kvack.org