drm/shmem-helper: Reset vma->vm_ops before calling dma_buf_mmap()
Subsystems (3)
PATCH 1/1 drm/shmem-helper: Reset vma->vm_ops before calling dma_buf_mmap()
The dma-buf backend is supposed to provide its own vm_ops, but some implementation just have nothing special to do and leave vm_ops untouched, probably expecting this field to be zero initialized (this is the case with the system_heap implementation for instance). Let's reset vma->vm_ops to NULL to keep things working with these implementations.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_gem_shmem_helper.c +6 -0
@@ -623,7 +623,13 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_structint ret;if (obj->import_attach) { +/* Reset both vm_ops and vm_private_data, so we don't end up with +* vm_ops pointing to our implementation if the dma-buf backend +* doesn't set those fields. +*/ vma->vm_private_data =NULL ; + vma->vm_ops =NULL ; + ret =dma_buf_mmap (obj->dma_buf, vma,0 );/* Drop the reference drm_gem_mmap_obj() acquired.*/
Signature · 1 line
2.41.0
Quoted 11 lines · On Mon, 24 Jul 2023 13:26:10 +0200 Boris Brezillon…
The dma-buf backend is supposed to provide its own
vm_ops, but some implementation just have nothing special to do and leavevm_opsuntouched, probably expecting this field to be zero initialized (this is the case with thesystem_heapimplementation for instance). Let's resetvma->vm_opsto NULL to keep things working with these implementations.Fixes 26d3ac3cb04d ("drm/shmem-helpers: Redirect mmap for imported dma-buf")Cc <[email protected]>Cc Daniel Vetter <[email protected]>Reported-by Roman Stratiienko <[email protected]>
Adding Roman's tested-by coming from [1]
[1]https://gitlab.freedesktop.org/mesa/mesa/-/issues/9416#note_2013722
Quoted 23 lines
Signed-off-by Boris Brezillon <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/drm_gem_shmem_helper.c +6
-0@@ -623,7 +623,13 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_structint ret;if (obj->import_attach) { +/* Reset both vm_ops and vm_private_data, so we don't end up with +* vm_ops pointing to our implementation if the dma-buf backend +* doesn't set those fields. +*/ vma->vm_private_data =NULL ; + vma->vm_ops =NULL ; + ret =dma_buf_mmap (obj->dma_buf, vma,0 );/* Drop the reference drm_gem_mmap_obj() acquired.*/
Thomas Zimmermann
maintainerHi
Am 24.07.23 um 13:26 schrieb Boris Brezillon:
Quoted 6 lines
The dma-buf backend is supposed to provide its own
vm_ops, but some implementation just have nothing special to do and leavevm_opsuntouched, probably expecting this field to be zero initialized (this is the case with thesystem_heapimplementation for instance). Let's resetvma->vm_opsto NULL to keep things working with these implementations.
Thanks for your patch. This bug could affect a number of GEM implementations. Instead of fixing this individually, could we set the fields conditionally at
https://elixir.bootlin.com/linux/v6.4/source/drivers/gpu/drm/drm_gem.c#L1042
?
Something like
if (!object->import_attach) {
vma->priv =
vma->ops =
}plus a descriptive comment like the one you have in your patch.
Best regards
Thomas
Quoted 28 lines
Fixes 26d3ac3cb04d ("drm/shmem-helpers: Redirect mmap for imported dma-buf")Cc <[email protected]>Cc Daniel Vetter <[email protected]>Reported-by Roman Stratiienko <[email protected]>Signed-off-by Boris Brezillon <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/drm_gem_shmem_helper.c +6
-0@@ -623,7 +623,13 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_structint ret;if (obj->import_attach) { +/* Reset both vm_ops and vm_private_data, so we don't end up with +* vm_ops pointing to our implementation if the dma-buf backend +* doesn't set those fields. +*/ vma->vm_private_data =NULL ; + vma->vm_ops =NULL ; + ret =dma_buf_mmap (obj->dma_buf, vma,0 );/* Drop the reference drm_gem_mmap_obj() acquired.*/
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Quoted 10 lines · On Tue, 25 Jul 2023 20:50:43 +0200 Thomas Zimmermann <[email protected]>…
Hi
Am 24.07.23 um 13:26 schrieb Boris Brezillon:
Quoted 6 lines
The dma-buf backend is supposed to provide its own
vm_ops, but some implementation just have nothing special to do and leavevm_opsuntouched, probably expecting this field to be zero initialized (this is the case with thesystem_heapimplementation for instance). Let's resetvma->vm_opsto NULL to keep things working with these implementations.
Quoted 2 lines
Thanks for your patch. This bug could affect a number of GEM implementations.
The one I found that is probably hit by the same problem is exynos_drm_gem.c, but there might be others...
Quoted 11 lines
Instead of fixing this individually, could we set the fields conditionally at
https://elixir.bootlin.com/linux/v6.4/source/drivers/gpu/drm/drm_gem.c#L1042
?
Something like
if (!object->import_attach) {
If guess you meant the opposite: if (object->import_attach)
Quoted 3 lines
vma->priv = vma->ops =}
I suspect it will break other drivers relying on the fact vma->vm_ops is auto-magically assigned to obj->funcs->vm_ops, even for prime buffers. The one I'm looking at right now is amdgpu: it has its own way of mapping imported dma-bufs, and resetting vma->vm_ops to NULL means the ttm layer will fallback to the default ttm_bo_vm_ops, which is not what amdgpu wants.
AFAICT, etnaviv is in the same situtation, though it's probably easier to fix, given the open/close hooks for imported objects doesn't do much.
TLDR; yes, it'd be great to have this 'fix' moved at the core level, or even have a dedicated path for dma-buf objects, but I fear it's going to fall apart if we do that.
One option would be to add a dma_buf_vm_ops field to drm_gem_object_funcs, add a DRM_GEM_OBJ_FUNCS_SET_VM_OPS(vm_ops, dma_buf_vm_ops) macro that would assign both dma_buf_vm_ops and vm_ops, patch all existing drivers to use this macro (mechanical change where we assign both fields to the same value, so we don't break anything, but don't fix broken implementations either). Once this is in place, we can have the following in drm_gem_mmap_obj():
vma->vm_ops = object->import_attach ? object->funcs->dma_buf_vm_ops : object->funcs->vm_ops; vma->vm_private_data = vma->vm_ops ? obj : NULL;
And then we can specialize the shmem and exynos implementations (actually, any implementation that's entirely deferring the mmap to the dma-buf layer), so they explicitly set dma_buf_vm_ops to NULL.
Honestly, I'm not sure this is better than manually assigning vma->vm_ops to NULL in the driver mmap function, but at least people will have to consider it when they write their driver ('do I want the same mmap behavior for dmabuf and !dmabuf?').
Anyway, I think this fix is worth applying, because it's self-contained and easy to backport. We can discuss and sort out how we want to fix the problem more generically later on.
Quoted 35 lines
plus a descriptive comment like the one you have in your patch.
Best regards
ThomasQuoted 28 lines
Fixes 26d3ac3cb04d ("drm/shmem-helpers: Redirect mmap for imported dma-buf")Cc <[email protected]>Cc Daniel Vetter <[email protected]>Reported-by Roman Stratiienko <[email protected]>Signed-off-by Boris Brezillon <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/drm_gem_shmem_helper.c +6
-0@@ -623,7 +623,13 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_structint ret;if (obj->import_attach) { +/* Reset both vm_ops and vm_private_data, so we don't end up with +* vm_ops pointing to our implementation if the dma-buf backend +* doesn't set those fields. +*/ vma->vm_private_data =NULL ; + vma->vm_ops =NULL ; + ret =dma_buf_mmap (obj->dma_buf, vma,0 );/* Drop the reference drm_gem_mmap_obj() acquired.*/
Hi
Am 26.07.23 um 09:57 schrieb Boris Brezillon:
Quoted 25 lines
Quoted 10 lines · On Tue, 25 Jul 2023 20:50:43 +0200 Thomas Zimmermann <[email protected]>…
Hi
Am 24.07.23 um 13:26 schrieb Boris Brezillon:
Quoted 6 lines
The dma-buf backend is supposed to provide its own
vm_ops, but some implementation just have nothing special to do and leavevm_opsuntouched, probably expecting this field to be zero initialized (this is the case with thesystem_heapimplementation for instance). Let's resetvma->vm_opsto NULL to keep things working with these implementations.Quoted 2 lines
Thanks for your patch. This bug could affect a number of GEM implementations.
The one I found that is probably hit by the same problem is
exynos_drm_gem.c, but there might be others...Quoted 6 lines
Instead of fixing this individually, could we set the fields conditionally at
https://elixir.bootlin.com/linux/v6.4/source/drivers/gpu/drm/drm_gem.c#L1042
Quoted 7 lines
Quoted 5 lines
?
Something like
if (!object->import_attach) {If guess you meant the opposite: if (
object->import_attach)
No, we'd want to assign iff it's not an imported buffer.
Quoted 12 lines
Quoted 4 lines
vma->priv = vma->ops = }I suspect it will break other drivers relying on the fact
vma->vm_opsis auto-magically assigned toobj->funcs->vm_ops, even for prime buffers. The one I'm looking at right now is amdgpu: it has its own way of mapping imported dma-bufs, and resettingvma->vm_opsto NULL means the ttm layer will fallback to the defaultttm_bo_vm_ops, which is not what amdgpu wants.
Quoted 6 lines
AFAICT, etnaviv is in the same situtation, though it's probably easier to fix, given the open/close hooks for imported objects doesn't do much.
TLDR; yes, it'd be great to have this 'fix' moved at the core level, or even have a dedicated path for dma-buf objects, but I fear it's going to fall apart if we do that.
I see. So for the current patch, you can add
I think we should keep the general solution in mind. Maybe this can be tried later.
Best regards
Thomas
Quoted 64 lines
One option would be to add a
dma_buf_vm_opsfield todrm_gem_object_funcs, add aDRM_GEM_OBJ_FUNCS_SET_VM_OPS(vm_ops, dma_buf_vm_ops)macro that would assign bothdma_buf_vm_opsandvm_ops, patch all existing drivers to use this macro (mechanical change where we assign both fields to the same value, so we don't break anything, but don't fix broken implementations either). Once this is in place, we can have the following indrm_gem_mmap_obj():vma->vm_ops = object->import_attach ? object->funcs->dma_buf_vm_ops : object->funcs->vm_ops; vma->vm_private_data = vma->vm_ops ? obj : NULL;And then we can specialize the shmem and exynos implementations (actually, any implementation that's entirely deferring the mmap to the dma-buf layer), so they explicitly set
dma_buf_vm_opsto NULL.Honestly, I'm not sure this is better than manually assigning
vma->vm_opsto NULL in the driver mmap function, but at least people will have to consider it when they write their driver ('do I want the same mmap behavior for dmabuf and !dmabuf?').Anyway, I think this fix is worth applying, because it's self-contained and easy to backport. We can discuss and sort out how we want to fix the problem more generically later on.
Quoted 35 lines
plus a descriptive comment like the one you have in your patch.
Best regards
ThomasQuoted 28 lines
Fixes 26d3ac3cb04d ("drm/shmem-helpers: Redirect mmap for imported dma-buf")Cc <[email protected]>Cc Daniel Vetter <[email protected]>Reported-by Roman Stratiienko <[email protected]>Signed-off-by Boris Brezillon <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/drm_gem_shmem_helper.c +6
-0@@ -623,7 +623,13 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_structint ret;if (obj->import_attach) { +/* Reset both vm_ops and vm_private_data, so we don't end up with +* vm_ops pointing to our implementation if the dma-buf backend +* doesn't set those fields. +*/ vma->vm_private_data =NULL ; + vma->vm_ops =NULL ; + ret =dma_buf_mmap (obj->dma_buf, vma,0 );/* Drop the reference drm_gem_mmap_obj() acquired.*/
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Boris Brezillon
AppliedQuoted 7 lines · On Mon, 24 Jul 2023 13:26:10 +0200 Boris Brezillon…
The dma-buf backend is supposed to provide its own
vm_ops, but some implementation just have nothing special to do and leavevm_opsuntouched, probably expecting this field to be zero initialized (this is the case with thesystem_heapimplementation for instance). Let's resetvma->vm_opsto NULL to keep things working with these implementations.
Quoted 5 lines
Fixes 26d3ac3cb04d ("drm/shmem-helpers: Redirect mmap for imported dma-buf")Cc <[email protected]>Cc Daniel Vetter <[email protected]>Reported-by Roman Stratiienko <[email protected]>Signed-off-by Boris Brezillon <[email protected]>
Queued to drm-misc-fixes.
Quoted 22 lines
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/drm_gem_shmem_helper.c +6
-0@@ -623,7 +623,13 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_structint ret;if (obj->import_attach) { +/* Reset both vm_ops and vm_private_data, so we don't end up with +* vm_ops pointing to our implementation if the dma-buf backend +* doesn't set those fields. +*/ vma->vm_private_data =NULL ; + vma->vm_ops =NULL ; + ret =dma_buf_mmap (obj->dma_buf, vma,0 );/* Drop the reference drm_gem_mmap_obj() acquired.*/