2019-01-11 15:08:42

by Souptick Joarder

Subject: [PATCH 5/9] drm/xen/xen_drm_front_gem.c: Convert to use vm_insert_range

Convert to use vm_insert_range() to map range of kernel
memory to user vma.

Signed-off-by: Souptick Joarder <[email protected]>
---
drivers/gpu/drm/xen/xen_drm_front_gem.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c
index 47ff019..9990c2f 100644
--- a/drivers/gpu/drm/xen/xen_drm_front_gem.c
+++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c
@@ -225,8 +225,7 @@ struct drm_gem_object *
static int gem_mmap_obj(struct xen_gem_object *xen_obj,
struct vm_area_struct *vma)
{
- unsigned long addr = vma->vm_start;
- int i;
+ int ret;

/*
* clear the VM_PFNMAP flag that was set by drm_gem_mmap(), and set the
@@ -247,18 +246,11 @@ static int gem_mmap_obj(struct xen_gem_object *xen_obj,
* FIXME: as we insert all the pages now then no .fault handler must
* be called, so don't provide one
*/
- for (i = 0; i < xen_obj->num_pages; i++) {
- int ret;
-
- ret = vm_insert_page(vma, addr, xen_obj->pages[i]);
- if (ret < 0) {
- DRM_ERROR("Failed to insert pages into vma: %d\n", ret);
- return ret;
- }
+ ret = vm_insert_range(vma, xen_obj->pages, xen_obj->num_pages);
+ if (ret < 0)
+ DRM_ERROR("Failed to insert pages into vma: %d\n", ret);

- addr += PAGE_SIZE;
- }
- return 0;
+ return ret;
}

int xen_drm_front_gem_mmap(struct file *filp, struct vm_area_struct *vma)
--
1.9.1

2019-01-11 20:49:29

by Oleksandr Andrushchenko

Subject: Re: [PATCH 5/9] drm/xen/xen_drm_front_gem.c: Convert to use vm_insert_range

On 1/11/19 5:10 PM, Souptick Joarder wrote:
> Convert to use vm_insert_range() to map range of kernel
> memory to user vma.
>
> Signed-off-by: Souptick Joarder <[email protected]>
Reviewed-by: Oleksandr Andrushchenko <[email protected]>
> ---
> drivers/gpu/drm/xen/xen_drm_front_gem.c | 18 +++++-------------
> 1 file changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c
> index 47ff019..9990c2f 100644
> --- a/drivers/gpu/drm/xen/xen_drm_front_gem.c
> +++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c
> @@ -225,8 +225,7 @@ struct drm_gem_object *
> static int gem_mmap_obj(struct xen_gem_object *xen_obj,
> struct vm_area_struct *vma)
> {
> - unsigned long addr = vma->vm_start;
> - int i;
> + int ret;
>
> /*
> * clear the VM_PFNMAP flag that was set by drm_gem_mmap(), and set the
> @@ -247,18 +246,11 @@ static int gem_mmap_obj(struct xen_gem_object *xen_obj,
> * FIXME: as we insert all the pages now then no .fault handler must
> * be called, so don't provide one
> */
> - for (i = 0; i < xen_obj->num_pages; i++) {
> - int ret;
> -
> - ret = vm_insert_page(vma, addr, xen_obj->pages[i]);
> - if (ret < 0) {
> - DRM_ERROR("Failed to insert pages into vma: %d\n", ret);
> - return ret;
> - }
> + ret = vm_insert_range(vma, xen_obj->pages, xen_obj->num_pages);
> + if (ret < 0)
> + DRM_ERROR("Failed to insert pages into vma: %d\n", ret);
>
> - addr += PAGE_SIZE;
> - }
> - return 0;
> + return ret;
> }
>
> int xen_drm_front_gem_mmap(struct file *filp, struct vm_area_struct *vma)