drm: Set vm_ops to GEM object's values during mmap
Subsystems (2)
Thomas Zimmermann
maintainerPATCH 1/1 drm: Set vm_ops to GEM object's values during mmap
The GEM mmap code relies on the GEM object's mmap callback to set the VMA's vm_ops field. This is easily forgotten and lead to a memory leak in the CMA helpers. Instead set the vm_ops field in the DRM core code to the GEM object's value. Drivers with different needs can override this in their mmap callback.
--- drivers/gpu/drm/drm_gem.c | 23 ++++++++++++----------- drivers/gpu/drm/drm_prime.c | 4 ++++ 2 files changed, 16 insertions(+), 11 deletions(-)
drivers/gpu/drm/drm_gem.c +12 -11
@@ -1069,27 +1069,28 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, vma->vm_private_data = obj; +if (!obj->funcs->vm_ops) { + ret = -EINVAL ; + goto err_drm_gem_object_put; + } + vma->vm_ops = obj->funcs->vm_ops; +if (obj->funcs->mmap) { ret = obj->funcs->mmap (obj, vma); -if (ret) { -drm_gem_object_put (obj); -return ret; - } +if (ret) + goto err_drm_gem_object_put;WARN_ON (!(vma->vm_flags &VM_DONTEXPAND )); }else { -if (obj->funcs->vm_ops) - vma->vm_ops = obj->funcs->vm_ops; -else { -drm_gem_object_put (obj); -return -EINVAL ; - } - vma->vm_flags |=VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); }return 0 ; + +err_drm_gem_object_put: +drm_gem_object_put (obj); +return ret; }EXPORT_SYMBOL (drm_gem_mmap_obj);
drivers/gpu/drm/drm_prime.c +4 -0
@@ -717,6 +717,10 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) vma->vm_pgoff +=drm_vma_node_start (&obj->vma_node);if (obj->funcs && obj->funcs->mmap) { +if (!obj->funcs->vm_ops) +return -EINVAL ; + vma->vm_ops = obj->funcs->vm_ops; + ret = obj->funcs->mmap (obj, vma);if (ret)return ret;
Signature · 6 lines
2.29.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Thomas,
Quoted 2 lines · Thomas Zimmermann
The GEM mmap code relies on the GEM object's mmap callback to set the VMA's
vm_opsfield. This is easily forgotten and lead to a memory leak
s/lead/can lead/
Quoted 7 lines
in the CMA helpers. Instead set the
vm_opsfield in the DRM core code to the GEM object's value. Drivers with different needs can override this in their mmap callback.Signed-off-by Thomas Zimmermann <[email protected]>Fixes f5ca8eb6f9bd ("drm/cma-helper: Implement mmap as GEM CMA object functions")Reported-by Kieran Bingham <[email protected]>
This also works here.
- https://paste.ubuntu.com/p/S2Q586rgwT/
Quoted 61 lines
Cc Maxime Ripard <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Eric Anholt <[email protected]>--- drivers/gpu/drm/drm_gem.c | 23 ++++++++++++----------- drivers/gpu/drm/drm_prime.c | 4 ++++ 2 files changed, 16 insertions(+), 11 deletions(-)drivers/gpu/drm/drm_gem.c +12
-11@@ -1069,27 +1069,28 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, vma->vm_private_data = obj; +if (!obj->funcs->vm_ops) { + ret = -EINVAL ; + goto err_drm_gem_object_put; + } + vma->vm_ops = obj->funcs->vm_ops; +if (obj->funcs->mmap) { ret = obj->funcs->mmap (obj, vma); -if (ret) { -drm_gem_object_put (obj); -return ret; - } +if (ret) + goto err_drm_gem_object_put;WARN_ON (!(vma->vm_flags &VM_DONTEXPAND )); }else { -if (obj->funcs->vm_ops) - vma->vm_ops = obj->funcs->vm_ops; -else { -drm_gem_object_put (obj); -return -EINVAL ; - } - vma->vm_flags |=VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); }return 0 ; + +err_drm_gem_object_put: +drm_gem_object_put (obj); +return ret; }EXPORT_SYMBOL (drm_gem_mmap_obj);drivers/gpu/drm/drm_prime.c +0
-0
drivers/gpu/drm/drm_prime.c int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) · line 726
Quoted 10 lines
drivers/gpu/drm/drm_prime.c +4
-0@@ -717,6 +717,10 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) vma->vm_pgoff +=drm_vma_node_start (&obj->vma_node);if (obj->funcs && obj->funcs->mmap) { +if (!obj->funcs->vm_ops) +return -EINVAL ; + vma->vm_ops = obj->funcs->vm_ops; + ret = obj->funcs->mmap (obj, vma);if (ret)return ret;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerHi
Am 15.01.21 um 10:17 schrieb Kieran Bingham:
Quoted 12 lines
Hi Thomas,
Quoted 2 lines · Thomas Zimmermann
The GEM mmap code relies on the GEM object's mmap callback to set the VMA's
vm_opsfield. This is easily forgotten and lead to a memory leaks/lead/can lead/
Quoted 4 lines
in the CMA helpers. Instead set the
vm_opsfield in the DRM core code to the GEM object's value. Drivers with different needs can override this in their mmap callback.
Quoted 8 lines
Quoted 3 lines
Signed-off-by Thomas Zimmermann <[email protected]>Fixes f5ca8eb6f9bd ("drm/cma-helper: Implement mmap as GEM CMA object functions")Reported-by Kieran Bingham <[email protected]>This also works here.
- https://paste.ubuntu.com/p/S2Q586rgwT/Tested-by Kieran Bingham <[email protected]>
Great! I have to send out another iteration of the patch, but I think the change is such that I can keep the Tested-by.
Best regards
Thomas
Quoted 78 lines
Quoted 62 lines
Cc Maxime Ripard <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Eric Anholt <[email protected]>--- drivers/gpu/drm/drm_gem.c | 23 ++++++++++++----------- drivers/gpu/drm/drm_prime.c | 4 ++++ 2 files changed, 16 insertions(+), 11 deletions(-)drivers/gpu/drm/drm_gem.c +12
-11@@ -1069,27 +1069,28 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, vma->vm_private_data = obj; +if (!obj->funcs->vm_ops) { + ret = -EINVAL ; + goto err_drm_gem_object_put; + } + vma->vm_ops = obj->funcs->vm_ops; +if (obj->funcs->mmap) { ret = obj->funcs->mmap (obj, vma); -if (ret) { -drm_gem_object_put (obj); -return ret; - } +if (ret) + goto err_drm_gem_object_put;WARN_ON (!(vma->vm_flags &VM_DONTEXPAND )); }else { -if (obj->funcs->vm_ops) - vma->vm_ops = obj->funcs->vm_ops; -else { -drm_gem_object_put (obj); -return -EINVAL ; - } - vma->vm_flags |=VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); }return 0 ; + +err_drm_gem_object_put: +drm_gem_object_put (obj); +return ret; }EXPORT_SYMBOL (drm_gem_mmap_obj);drivers/gpu/drm/drm_prime.c +0
-0drivers/gpu/drm/drm_prime.c int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) · line 726
Quoted 10 lines
drivers/gpu/drm/drm_prime.c +4
-0@@ -717,6 +717,10 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) vma->vm_pgoff +=drm_vma_node_start (&obj->vma_node);if (obj->funcs && obj->funcs->mmap) { +if (!obj->funcs->vm_ops) +return -EINVAL ; + vma->vm_ops = obj->funcs->vm_ops; + ret = obj->funcs->mmap (obj, vma);if (ret)return ret;_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 20 lines · Thomas Zimmermann
Hi
Am 15.01.21 um 10:17 schrieb Kieran Bingham:
Quoted 17 lines
Hi Thomas,
Quoted 2 lines · Thomas Zimmermann
The GEM mmap code relies on the GEM object's mmap callback to set the VMA's
vm_opsfield. This is easily forgotten and lead to a memory leaks/lead/can lead/
Quoted 8 lines
in the CMA helpers. Instead set the
vm_opsfield in the DRM core code to the GEM object's value. Drivers with different needs can override this in their mmap callback.Signed-off-by Thomas Zimmermann <[email protected]>Fixes f5ca8eb6f9bd ("drm/cma-helper: Implement mmap as GEM CMAobject functions")
Reported-by Kieran Bingham <[email protected]>
Quoted 7 lines
Quoted 4 lines
This also works here.
- https://paste.ubuntu.com/p/S2Q586rgwT/Tested-by Kieran Bingham <[email protected]>Great! I have to send out another iteration of the patch, but I think the change is such that I can keep the Tested-by.
I have this test automated now, so I'll kick off a validation run on the new patch as well.
--
Kieran
Quoted 82 lines
Best regards
ThomasQuoted 77 lines
Quoted 61 lines
Cc Maxime Ripard <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Eric Anholt <[email protected]>---
drivers/gpu/drm/drm_gem.c | 23 ++++++++++++-----------drivers/gpu/drm/drm_prime.c| 4 ++++2 files changed, 16 insertions(+), 11 deletions(-)drivers/gpu/drm/drm_gem.c +7
-11@@ -1069,27 +1069,28 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, vma->vm_private_data = obj; + if (!obj->funcs->vm_ops) { + ret = -EINVAL; + goto err_drm_gem_object_put; + } + vma->vm_ops = obj->funcs->vm_ops; + if (obj->funcs->mmap) { ret = obj->funcs->mmap(obj, vma); - if (ret) { - drm_gem_object_put(obj); - return ret; - } + if (ret) + goto err_drm_gem_object_put; WARN_ON(!(vma->vm_flags & VM_DONTEXPAND)); } else { - if (obj->funcs->vm_ops) - vma->vm_ops = obj->funcs->vm_ops; - else { - drm_gem_object_put(obj); - return -EINVAL; - } -
vma->vm_flags|=VM_IO|VM_PFNMAP|VM_DONTEXPAND|VM_DONTDUMP;
vma->vm_page_prot= pgprot_writecombine(vm_get_page_prot(vma->vm_flags));vma->vm_page_prot=pgprot_decrypted(vma->vm_page_prot); }
return 0;drivers/gpu/drm/drm_gem.c +4
-0+ +err_drm_gem_object_put: + drm_gem_object_put(obj); + return ret;}
EXPORT_SYMBOL(drm_gem_mmap_obj);
diff --gita/drivers/gpu/drm/drm_prime.cb/drivers/gpu/drm/drm_prime.cindex683aa29ecd3b..0549ec190583100644drivers/gpu/drm/drm_prime.c int drm_gem_prime_mmap(struct drm_gem_object · line 726
Quoted 10 lines
drivers/gpu/drm/drm_prime.c +4
-0@@ -717,6 +717,10 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) vma->vm_pgoff += drm_vma_node_start(&obj->vma_node); if (obj->funcs && obj->funcs->mmap) { + if (!obj->funcs->vm_ops) + return -EINVAL; + vma->vm_ops = obj->funcs->vm_ops; + ret = obj->funcs->mmap(obj, vma); if (ret) return ret;_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel