drm/gem-shmem: When drm_gem_object_init failed, should release object
Subsystems (3)
PATCH v2 1/1 drm/gem-shmem: When drm_gem_object_init failed, should release object
when goto err_free, the object had init, so it should be release when fail.
--- drivers/gpu/drm/drm_gem.c | 19 ++++++++++++++++--- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +++- include/drm/drm_gem.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_gem.c +16 -3
@@ -169,6 +169,21 @@ void drm_gem_private_object_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_gem_private_object_init); +/** +* drm_gem_private_object_fini - Finalize a failed drm_gem_object +* @obj: drm_gem_object +* +* Uninitialize an already allocated GEM object when it initialized failed +*/ +void drm_gem_private_object_fini (struct drm_gem_object *obj) +{ +WARN_ON (obj->dma_buf); + +dma_resv_fini (&obj->_resv); +drm_gem_lru_remove (obj); +} +EXPORT_SYMBOL (drm_gem_private_object_fini); +/** * drm_gem_object_handle_free - release resources bound to userspace handles * @obj: GEM object to clean up.
@@ -930,14 +945,12 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private)void drm_gem_object_release (struct drm_gem_object *obj) { -WARN_ON (obj->dma_buf); +drm_gem_private_object_fini (obj);if (obj->filp)fput (obj->filp); -dma_resv_fini (&obj->_resv);drm_gem_free_mmap_offset (obj); -drm_gem_lru_remove (obj); }EXPORT_SYMBOL (drm_gem_object_release);
drivers/gpu/drm/drm_gem_shmem_helper.c +3 -1
@@ -79,8 +79,10 @@ __drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private) }else { ret =drm_gem_object_init (dev, obj, size); } -if (ret) +if (ret) { +drm_gem_private_object_fini (obj) goto err_free; + } ret =drm_gem_create_mmap_offset (obj);if (ret)
include/drm/drm_gem.h +1 -0
@@ -405,6 +405,7 @@ int drm_gem_object_init(struct drm_device *dev, struct drm_gem_object *obj, size_t size);void drm_gem_private_object_init (struct drm_device *dev,struct drm_gem_object *obj,size_t size); +void drm_gem_private_object_fini (struct drm_gem_object *obj);void drm_gem_vm_open (struct vm_area_struct *vma);void drm_gem_vm_close (struct vm_area_struct *vma); int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
Signature · 1 line
2.25.1
Thomas Zimmermann
maintainerHi
Am 11.11.22 um 04:38 schrieb ChunyouTang:
Quoted 16 lines
when goto
err_free, the object had init, so it should be release when fail.Signed-off-by ChunyouTang <[email protected]>--- drivers/gpu/drm/drm_gem.c | 19 ++++++++++++++++--- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +++- include/drm/drm_gem.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-)drivers/gpu/drm/drm_gem.c +0
-0@@ -169,6 +169,21 @@ void drm_gem_private_object_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_gem_private_object_init);
drivers/gpu/drm/drm_gem.c void drm_gem_private_object_init(struct drm_device *dev, · line 180
Quoted 10 lines
drivers/gpu/drm/drm_gem.c +9
-0+/** +* drm_gem_private_object_fini - Finalize a failed drm_gem_object +* @obj: drm_gem_object +* +* Uninitialize an already allocated GEM object when it initialized failed +*/ +void drm_gem_private_object_fini (struct drm_gem_object *obj) +{ +WARN_ON (obj->dma_buf);
Rather lease this in its original place.
drivers/gpu/drm/drm_gem.c void drm_gem_private_object_init(struct drm_device *dev, · line 183
Quoted 3 lines
drivers/gpu/drm/drm_gem.c +3
-0+ +dma_resv_fini (&obj->_resv); +drm_gem_lru_remove (obj);
AFAICT drm_gem_lru_remove() doesn't belong into this function.
Quoted 7 lines
drivers/gpu/drm/drm_gem.c +3
-0+} +EXPORT_SYMBOL (drm_gem_private_object_fini); +/** * drm_gem_object_handle_free - release resources bound to userspace handles * @obj: GEM object to clean up.
drivers/gpu/drm/drm_gem.c drm_gem_release(struct drm_device *dev, struct drm_file *file_private) · line 938
Quoted 10 lines
drivers/gpu/drm/drm_gem.c +1
-2@@ -930,14 +945,12 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private)void drm_gem_object_release (struct drm_gem_object *obj) { -WARN_ON (obj->dma_buf); +drm_gem_private_object_fini (obj);if (obj->filp)fput (obj->filp); -dma_resv_fini (&obj->_resv);
Please call drm_gem_private_object_fini() here.
drivers/gpu/drm/drm_gem.c drm_gem_release(struct drm_device *dev, struct drm_file *file_private) · line 940
Quoted 2 lines
drivers/gpu/drm/drm_gem.c +0
-1drm_gem_free_mmap_offset (obj); -drm_gem_lru_remove (obj);
Please keep this line here.
Best regards
Thomas
Quoted 31 lines
drivers/gpu/drm/drm_gem.c +0
-0}EXPORT_SYMBOL (drm_gem_object_release);drivers/gpu/drm/drm_gem_shmem_helper.c +3
-1@@ -79,8 +79,10 @@ __drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private) }else { ret =drm_gem_object_init (dev, obj, size); } -if (ret) +if (ret) { +drm_gem_private_object_fini (obj) goto err_free; + } ret =drm_gem_create_mmap_offset (obj);if (ret)include/drm/drm_gem.h +1
-0@@ -405,6 +405,7 @@ int drm_gem_object_init(struct drm_device *dev, struct drm_gem_object *obj, size_t size);void drm_gem_private_object_init (struct drm_device *dev,struct drm_gem_object *obj,size_t size); +void drm_gem_private_object_fini (struct drm_gem_object *obj);void drm_gem_vm_open (struct vm_area_struct *vma);void drm_gem_vm_close (struct vm_area_struct *vma); int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
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: Ivo Totev
Hi Thomas,
Can I discard the first two patchs, and pull the new code, then modify and git send-email this patch?
于 Thu, 17 Nov 2022 14:42:36 +0100
Quoted 102 lines · Thomas Zimmermann
Hi
Am 11.11.22 um 04:38 schrieb ChunyouTang:
Quoted 25 lines
when goto
err_free, the object had init, so it should be release when fail.Signed-off-by ChunyouTang <[email protected]>--- drivers/gpu/drm/drm_gem.c | 19 ++++++++++++++++--- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +++- include/drm/drm_gem.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-)drivers/gpu/drm/drm_gem.c +5
-0@@ -169,6 +169,21 @@ void drm_gem_private_object_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_gem_private_object_init ); +/** +* drm_gem_private_object_fini - Finalize a failed drm_gem_object +* @obj: drm_gem_object +* +* Uninitialize an already allocated GEM object when it initialized failed
+ */drivers/gpu/drm/drm_gem.c void drm_gem_private_object_init(struct drm_device *dev, · line 180
Quoted 3 lines
drivers/gpu/drm/drm_gem.c +3
-0+void drm_gem_private_object_fini (struct drm_gem_object *obj) +{ +WARN_ON (obj->dma_buf);Rather lease this in its original place.
drivers/gpu/drm/drm_gem.c void drm_gem_private_object_init(struct drm_device *dev, · line 183
Quoted 3 lines
drivers/gpu/drm/drm_gem.c +3
-0+ +dma_resv_fini (&obj->_resv); +drm_gem_lru_remove (obj);AFAICT
drm_gem_lru_remove()doesn't belong into this function.Quoted 11 lines
drivers/gpu/drm/drm_gem.c +3
-0+} +EXPORT_SYMBOL (drm_gem_private_object_fini); +/** * drm_gem_object_handle_free - release resources bound to userspace handles
* @obj: GEM object to clean up.drivers/gpu/drm/drm_gem.c +0
-0@@ -930,14 +945,12 @@ drm_gem_release(struct drm_device *dev,struct
drm_file*file_private) void
drm_gem_object_release(struct drm_gem_object *obj){drivers/gpu/drm/drm_gem.c drm_gem_release(struct drm_device *dev, struct drm_file *file_private) · line 938
Quoted 7 lines
drivers/gpu/drm/drm_gem.c +1
-2-WARN_ON (obj->dma_buf); +drm_gem_private_object_fini (obj);if (obj->filp)fput (obj->filp); -dma_resv_fini (&obj->_resv);Please call
drm_gem_private_object_fini()here.drivers/gpu/drm/drm_gem.c drm_gem_release(struct drm_device *dev, struct drm_file *file_private) · line 940
Quoted 2 lines
drm_gem_free_mmap_offset(obj);drivers/gpu/drm/drm_gem.c +0
-1-drm_gem_lru_remove (obj);Please keep this line here.
Best regards
ThomasQuoted 32 lines
} EXPORT_SYMBOL(drm_gem_object_release);(quoted diff) +0
-0
b/drivers/gpu/drm/drm_gem_shmem_helper.cindex35138f8a375c..845e3d5d71eb100644 ---a/drivers/gpu/drm/drm_gem_shmem_helper.c+++b/drivers/gpu/drm/drm_gem_shmem_helper.c@@ -79,8 +79,10 @@__drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private)} else { ret =drm_gem_object_init(dev, obj, size);
}drivers/gpu/drm/drm_gem.c +3
-1-if (ret) +if (ret) { +drm_gem_private_object_fini (obj) goto err_free; + } ret =drm_gem_create_mmap_offset (obj);if (ret)include/drm/drm_gem.h +0
-0@@ -405,6 +405,7 @@ int drm_gem_object_init(struct drm_device *dev, struct drm_gem_object *obj, size_t size); void drm_gem_private_object_init(struct drm_device *dev, struct drm_gem_object *obj,
size_tsize); +voiddrm_gem_private_object_fini(struct drm_gem_object *obj); voiddrm_gem_vm_open(struct vm_area_struct *vma); voiddrm_gem_vm_close(struct vm_area_struct *vma);
int drm_gem_mmap_obj(structdrm_gem_object*obj, unsigned longobj_size,
Thomas Zimmermann
maintainerHi
Am 18.11.22 um 11:32 schrieb Chunyou Tang:
Quoted 3 lines
Hi Thomas,
Can I discard the first two patchs, and pull the new code, then modify and git send-email this patch?
Yes, of course. Just make sure that the next version is marked as v3, so it's obvious what it belongs to.
Best regards
Thomas
Quoted 108 lines
于 Thu, 17 Nov 2022 14:42:36 +0100
Quoted 102 lines · Thomas Zimmermann
Hi
Am 11.11.22 um 04:38 schrieb ChunyouTang:
Quoted 25 lines
when goto
err_free, the object had init, so it should be release when fail.Signed-off-by ChunyouTang <[email protected]>--- drivers/gpu/drm/drm_gem.c | 19 ++++++++++++++++--- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +++- include/drm/drm_gem.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-)drivers/gpu/drm/drm_gem.c +5
-0@@ -169,6 +169,21 @@ void drm_gem_private_object_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_gem_private_object_init ); +/** +* drm_gem_private_object_fini - Finalize a failed drm_gem_object +* @obj: drm_gem_object +* +* Uninitialize an already allocated GEM object when it initialized failed
+ */drivers/gpu/drm/drm_gem.c void drm_gem_private_object_init(struct drm_device *dev, · line 180
Quoted 3 lines
drivers/gpu/drm/drm_gem.c +3
-0+void drm_gem_private_object_fini (struct drm_gem_object *obj) +{ +WARN_ON (obj->dma_buf);Rather lease this in its original place.
drivers/gpu/drm/drm_gem.c void drm_gem_private_object_init(struct drm_device *dev, · line 183
Quoted 3 lines
drivers/gpu/drm/drm_gem.c +3
-0+ +dma_resv_fini (&obj->_resv); +drm_gem_lru_remove (obj);AFAICT
drm_gem_lru_remove()doesn't belong into this function.Quoted 11 lines
drivers/gpu/drm/drm_gem.c +3
-0+} +EXPORT_SYMBOL (drm_gem_private_object_fini); +/** * drm_gem_object_handle_free - release resources bound to userspace handles
* @obj: GEM object to clean up.drivers/gpu/drm/drm_gem.c +0
-0@@ -930,14 +945,12 @@ drm_gem_release(struct drm_device *dev,struct
drm_file*file_private) void
drm_gem_object_release(struct drm_gem_object *obj){drivers/gpu/drm/drm_gem.c drm_gem_release(struct drm_device *dev, struct drm_file *file_private) · line 938
Quoted 7 lines
drivers/gpu/drm/drm_gem.c +1
-2-WARN_ON (obj->dma_buf); +drm_gem_private_object_fini (obj);if (obj->filp)fput (obj->filp); -dma_resv_fini (&obj->_resv);Please call
drm_gem_private_object_fini()here.drivers/gpu/drm/drm_gem.c drm_gem_release(struct drm_device *dev, struct drm_file *file_private) · line 940
Quoted 2 lines
drm_gem_free_mmap_offset(obj);drivers/gpu/drm/drm_gem.c +0
-1-drm_gem_lru_remove (obj);Please keep this line here.
Best regards
ThomasQuoted 32 lines
} EXPORT_SYMBOL(drm_gem_object_release);(quoted diff) +0
-0
b/drivers/gpu/drm/drm_gem_shmem_helper.cindex35138f8a375c..845e3d5d71eb100644 ---a/drivers/gpu/drm/drm_gem_shmem_helper.c+++b/drivers/gpu/drm/drm_gem_shmem_helper.c@@ -79,8 +79,10 @@ __drm_gem_shmem_create(structdrm_device*dev,size_tsize, boolprivate) } else { ret = drm_gem_object_init(dev, obj, size); }drivers/gpu/drm/drm_gem.c +3
-1-if (ret) +if (ret) { +drm_gem_private_object_fini (obj) goto err_free; + } ret =drm_gem_create_mmap_offset (obj);if (ret)include/drm/drm_gem.h +0
-0@@ -405,6 +405,7 @@ int drm_gem_object_init(struct drm_device *dev, struct drm_gem_object *obj, size_t size); void drm_gem_private_object_init(struct drm_device *dev, struct drm_gem_object *obj,
size_tsize); +voiddrm_gem_private_object_fini(struct drm_gem_object *obj); voiddrm_gem_vm_open(struct vm_area_struct *vma); voiddrm_gem_vm_close(struct vm_area_struct *vma);
int drm_gem_mmap_obj(structdrm_gem_object*obj, unsigned longobj_size,
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: Ivo Totev