drm/msm: Ensure mmap offset is initialized
PATCH 1/1 drm/msm: Ensure mmap offset is initialized
From: Rob Clark <[email protected]>
If a GEM object is allocated, and then exported as a dma-buf fd which is mmap'd before or without the GEM buffer being directly mmap'd, the vma_node could be unitialized. This leads to a situation where the CPU mapping is not correctly torn down in drm_vma_node_unmap().
--- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_gem_prime.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_drv.c +1 -1
@@ -964,7 +964,7 @@ static const struct drm_driver msm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, - .gem_prime_mmap = drm_gem_prime_mmap, + .gem_prime_mmap = msm_gem_prime_mmap,#ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init,#endif
drivers/gpu/drm/msm/msm_drv.h +1 -0
@@ -275,6 +275,7 @@ unsigned long msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_tvoid msm_gem_shrinker_init (struct drm_device *dev);void msm_gem_shrinker_cleanup (struct drm_device *dev); +int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj);int msm_gem_prime_vmap (struct drm_gem_object *obj,struct iosys_map *map);void msm_gem_prime_vunmap (struct drm_gem_object *obj,struct iosys_map *map);
drivers/gpu/drm/msm/msm_gem_prime.c +15 -0
@@ -11,6 +11,21 @@#include "msm_drv.h" #include "msm_gem.h" +int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma) +{ +int ret; + +/* Ensure the mmap offset is initialized. We lazily initialize it, +* so if it has not been first mmap'd directly as a GEM object, the +* mmap offset will not be already initialized. +*/ + ret =drm_gem_create_mmap_offset (obj); +if (ret) +return ret; + +return drm_gem_prime_mmap (obj, vma); +} +struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj) {struct msm_gem_object *msm_obj =to_msm_bo (obj);
Signature · 1 line
2.36.1
Quoted 50 lines · Rob Clark
From: Rob Clark <[email protected]>
If a GEM object is allocated, and then exported as a dma-buf fd which is mmap'd before or without the GEM buffer being directly mmap'd, the
vma_nodecould be unitialized. This leads to a situation where the CPU mapping is not correctly torn down indrm_vma_node_unmap().Fixes e5516553999f ("drm: call drm_gem_object_funcs.mmap with fake offset")Signed-off-by Rob Clark <[email protected]>--- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_gem_prime.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/msm_drv.c +1
-1@@ -964,7 +964,7 @@ static const struct drm_driver msm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, - .gem_prime_mmap = drm_gem_prime_mmap, + .gem_prime_mmap = msm_gem_prime_mmap,#ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init,#endif drivers/gpu/drm/msm/msm_drv.h +1
-0@@ -275,6 +275,7 @@ unsigned long msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_tvoid msm_gem_shrinker_init (struct drm_device *dev);void msm_gem_shrinker_cleanup (struct drm_device *dev); +int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj);int msm_gem_prime_vmap (struct drm_gem_object *obj,struct iosys_map *map);void msm_gem_prime_vunmap (struct drm_gem_object *obj,struct iosys_map *map);drivers/gpu/drm/msm/msm_gem_prime.c +1
-0@@ -11,6 +11,21 @@#include "msm_drv.h" #include "msm_gem.h" +int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma)
drivers/gpu/drm/msm/msm_gem_prime.c line 24
Quoted 10 lines
drivers/gpu/drm/msm/msm_gem_prime.c +10
-0+{ +int ret; + +/* Ensure the mmap offset is initialized. We lazily initialize it, +* so if it has not been first mmap'd directly as a GEM object, the +* mmap offset will not be already initialized. +*/ + ret =drm_gem_create_mmap_offset (obj); +if (ret) +return ret;
Wouldn't it be better to have this call directly in the drm_gem_prime_mmap() ? This way all drivers can be lazy.
Quoted 10 lines
drivers/gpu/drm/msm/msm_gem_prime.c +4
-1+ +return drm_gem_prime_mmap (obj, vma); +} +struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj) {struct msm_gem_object *msm_obj =to_msm_bo (obj); --2.36.1
Signature · 2 lines
With best wishes Dmitry
Quoted 51 lines · Dmitry Baryshkov
Quoted 49 lines · Rob Clark
From: Rob Clark <[email protected]>
If a GEM object is allocated, and then exported as a dma-buf fd which is mmap'd before or without the GEM buffer being directly mmap'd, the
vma_nodecould be unitialized. This leads to a situation where the CPU mapping is not correctly torn down indrm_vma_node_unmap().Fixes e5516553999f ("drm: call drm_gem_object_funcs.mmap with fake offset")Signed-off-by Rob Clark <[email protected]>--- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_gem_prime.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/msm_drv.c +1
-1@@ -964,7 +964,7 @@ static const struct drm_driver msm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, - .gem_prime_mmap = drm_gem_prime_mmap, + .gem_prime_mmap = msm_gem_prime_mmap,#ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init,#endif drivers/gpu/drm/msm/msm_drv.h +1
-0@@ -275,6 +275,7 @@ unsigned long msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_tvoid msm_gem_shrinker_init (struct drm_device *dev);void msm_gem_shrinker_cleanup (struct drm_device *dev); +int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj);int msm_gem_prime_vmap (struct drm_gem_object *obj,struct iosys_map *map);void msm_gem_prime_vunmap (struct drm_gem_object *obj,struct iosys_map *map);drivers/gpu/drm/msm/msm_gem_prime.c +0
-0@@ -11,6 +11,21 @@#include "msm_drv.h" #include "msm_gem.h"
Quoted 15 lines
drivers/gpu/drm/msm/msm_gem_prime.c line 24
Quoted 11 lines
drivers/gpu/drm/msm/msm_gem_prime.c +11
-0+int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma) +{ +int ret; + +/* Ensure the mmap offset is initialized. We lazily initialize it, +* so if it has not been first mmap'd directly as a GEM object, the +* mmap offset will not be already initialized. +*/ + ret =drm_gem_create_mmap_offset (obj); +if (ret) +return ret;Wouldn't it be better to have this call directly in the
drm_gem_prime_mmap()? This way all drivers can be lazy.
yes.. that was my first[1] proposal. But there are differences of opinion, and in the mean time I want to get this particular issue fixed ;-)
BR,
-R
[1] https://patchwork.freedesktop.org/patch/487597/
Quoted 16 lines
Quoted 11 lines
drivers/gpu/drm/msm/msm_gem_prime.c +4
-1+ +return drm_gem_prime_mmap (obj, vma); +} +struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj) {struct msm_gem_object *msm_obj =to_msm_bo (obj); --2.36.1
--
With best wishes
Dmitry
Dmitry Baryshkov
Reviewed-byQuoted 70 lines · Rob Clark
Quoted 51 lines · Dmitry Baryshkov
Quoted 49 lines · Rob Clark
From: Rob Clark <[email protected]>
If a GEM object is allocated, and then exported as a dma-buf fd which is mmap'd before or without the GEM buffer being directly mmap'd, the
vma_nodecould be unitialized. This leads to a situation where the CPU mapping is not correctly torn down indrm_vma_node_unmap().Fixes e5516553999f ("drm: call drm_gem_object_funcs.mmap with fake offset")Signed-off-by Rob Clark <[email protected]>--- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_gem_prime.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/msm_drv.c +1
-1@@ -964,7 +964,7 @@ static const struct drm_driver msm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, - .gem_prime_mmap = drm_gem_prime_mmap, + .gem_prime_mmap = msm_gem_prime_mmap,#ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init,#endif drivers/gpu/drm/msm/msm_drv.h +1
-0@@ -275,6 +275,7 @@ unsigned long msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_tvoid msm_gem_shrinker_init (struct drm_device *dev);void msm_gem_shrinker_cleanup (struct drm_device *dev); +int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj);int msm_gem_prime_vmap (struct drm_gem_object *obj,struct iosys_map *map);void msm_gem_prime_vunmap (struct drm_gem_object *obj,struct iosys_map *map);drivers/gpu/drm/msm/msm_gem_prime.c +0
-0@@ -11,6 +11,21 @@#include "msm_drv.h" #include "msm_gem.h" Quoted 15 lines
drivers/gpu/drm/msm/msm_gem_prime.c line 24
Quoted 11 lines
drivers/gpu/drm/msm/msm_gem_prime.c +11
-0+int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma) +{ +int ret; + +/* Ensure the mmap offset is initialized. We lazily initialize it, +* so if it has not been first mmap'd directly as a GEM object, the +* mmap offset will not be already initialized. +*/ + ret =drm_gem_create_mmap_offset (obj); +if (ret) +return ret;Wouldn't it be better to have this call directly in the
drm_gem_prime_mmap()? This way all drivers can be lazy.
Quoted 3 lines
yes.. that was my first[1] proposal. But there are differences of opinion, and in the mean time I want to get this particular issue fixed ;-)
Ack, excuse me, I probably skipped the thread.
Quoted 22 lines
BR,
-R[1] https://patchwork.freedesktop.org/patch/487597/
Quoted 16 lines
Quoted 11 lines
drivers/gpu/drm/msm/msm_gem_prime.c +4
-1+ +return drm_gem_prime_mmap (obj, vma); +} +struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj) {struct msm_gem_object *msm_obj =to_msm_bo (obj); --2.36.1
--
With best wishes
Dmitry
Signature · 2 lines
With best wishes Dmitry