drm/msm/gem: Add some cleanup.h
Subsystems (4)
Rob Clark
maintainerPATCH v2 1/1 drm/msm/gem: Add some cleanup.h
Convert (most of) the msm_gem_lock() and friends over to scope based cleanup.
Other than fixing a lock leak in msm_ioctl_gem_info_set_metadata() there should be no functional change.
---
Rebased onto: https://patchwork.freedesktop.org/series/176884/
drivers/gpu/drm/msm/Makefile | 2 ++ drivers/gpu/drm/msm/msm_drv.c | 40 +++++++++------------------ drivers/gpu/drm/msm/msm_gem.c | 41 +++++++--------------------- drivers/gpu/drm/msm/msm_gem.h | 3 ++ drivers/gpu/drm/msm/msm_gem_submit.c | 6 ++-- drivers/gpu/drm/msm/msm_gpu.c | 3 +- 6 files changed, 32 insertions(+), 63 deletions(-)
drivers/gpu/drm/msm/Makefile +2 -0
@@ -254,3 +254,5 @@ $(addprefix $(obj)/,$(msm-y)): $(addprefix $(obj)/,$(ADRENO_HEADERS)) $(addprefix $(obj)/,$(msm-display-y)): $(addprefix $(obj)/,$(DISPLAY_HEADERS)) targets += $(ADRENO_HEADERS) $(DISPLAY_HEADERS) $(ADRENO_PERFCNTRS) + +CONTEXT_ANALYSIS_msm.o := y
drivers/gpu/drm/msm/msm_drv.c +13 -27
@@ -550,7 +550,6 @@ static int msm_ioctl_gem_info_set_metadata(struct drm_gem_object *obj, {struct msm_gem_object *msm_obj =to_msm_bo (obj);void *new_metadata; -void *buf;int ret;/* Impose a moderate upper bound on metadata size: */
@@ -559,32 +558,25 @@ static int msm_ioctl_gem_info_set_metadata(struct drm_gem_object *obj, }/* Use a temporary buf to keep copy_from_user() outside of gem obj lock: */ - buf =memdup_user (metadata, metadata_size); + void *buf __free(kfree) = memdup_user(metadata, metadata_size);if (IS_ERR (buf))return PTR_ERR (buf); - ret =msm_gem_lock_interruptible (obj); -if (ret) - goto out; +ACQUIRE (gem_lock_intr, lock)(obj); +if ((ret =ACQUIRE_ERR (gem_lock_intr, &lock))) +return ret; new_metadata =krealloc (msm_obj->metadata, metadata_size,GFP_KERNEL );if (!new_metadata) { - ret = -ENOMEM ; - goto unlock; +return -ENOMEM ; } msm_obj->metadata = new_metadata; msm_obj->metadata_size = metadata_size;memcpy (msm_obj->metadata, buf, metadata_size); -unlock: -msm_gem_unlock (obj); - -out: -kfree (buf); - -return ret; +return 0 ; } static int msm_ioctl_gem_info_get_metadata(struct drm_gem_object *obj,
@@ -608,26 +600,20 @@ static int msm_ioctl_gem_info_get_metadata(struct drm_gem_object *obj,return 0 ; } - ret =msm_gem_lock_interruptible (obj); -if (ret) -return ret; - -/* Avoid copy_to_user() under gem obj lock: */ - len = msm_obj->metadata_size; - buf =kmemdup (msm_obj->metadata, len,GFP_KERNEL ); - -if (!buf) { -msm_gem_unlock (obj); -return -ENOMEM ; + scoped_cond_guard (gem_lock_intr, return -EINTR, obj) { +/* Avoid copy_to_user() under gem obj lock by making a copy: */ + len = msm_obj->metadata_size; + buf =kmemdup (msm_obj->metadata, len,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; } -msm_gem_unlock (obj); -if (*metadata_size < len) { ret = -ETOOSMALL ; }else if (copy_to_user (metadata, buf, len)) { ret = -EFAULT ; }else { + ret =0 ; *metadata_size = len; }
drivers/gpu/drm/msm/msm_gem.c +10 -31
93 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem.h +3 -0
@@ -347,6 +347,9 @@ msm_gem_unlock(struct drm_gem_object *obj)dma_resv_unlock (obj->resv); } +DEFINE_LOCK_GUARD_1(gem_lock, struct drm_gem_object, msm_gem_lock(_T->lock), msm_gem_unlock(_T->lock)); +DEFINE_LOCK_GUARD_1_COND (gem_lock, _intr,msm_gem_lock_interruptible (_T->lock), _RET ==0 ); +/** * msm_gem_lock_vm_and_obj() - Helper to lock an obj + VM * @exec: the exec context helper which will be initalized
drivers/gpu/drm/msm/msm_gem_submit.c +3 -3
@@ -536,9 +536,9 @@ void msm_submit_retire(struct msm_gem_submit *submit)struct drm_gem_object *obj = submit->bos[i].obj;struct drm_gpuvm_bo *vm_bo = submit->bos[i].vm_bo; -msm_gem_lock (obj); -drm_gpuvm_bo_put (vm_bo); -msm_gem_unlock (obj); + scoped_guard (gem_lock, obj) +drm_gpuvm_bo_put (vm_bo); +drm_gem_object_put (obj); } }
drivers/gpu/drm/msm/msm_gpu.c +1 -2
@@ -308,10 +308,9 @@ static void crashstate_get_bos(struct msm_gpu_state *state, struct msm_gem_submistruct drm_gem_object *obj = submit->bos[i].obj;bool dump = rd_full || (submit->bos[i].flags &MSM_SUBMIT_BO_DUMP ); -msm_gem_lock (obj); +guard (gem_lock)(obj);msm_gpu_crashstate_get_bo (state, obj, submit->bos[i].iova, dump,0 , obj->size); -msm_gem_unlock (obj); } } }
Signature · 1 line
2.56.0
Quoted 5 lines · Rob Clark
Convert (most of) the
msm_gem_lock()and friends over to scope based cleanup.Other than fixing a lock leak in
msm_ioctl_gem_info_set_metadata()there should be no functional change.
[...]
drivers/gpu/drm/msm/msm_drv.c static int msm_ioctl_gem_info_get_metadata(struct drm_gem_object *obj, · line 613
Quoted 7 lines
drivers/gpu/drm/msm/msm_drv.c +0
-3@@ -608,26 +600,20 @@ static int msm_ioctl_gem_info_get_metadata(struct drm_gem_object *obj,return 0 ; } - ret =msm_gem_lock_interruptible (obj); -if (ret) -return ret;
LLM is a bit grumpy since this no longer returns all of the return codes that it can but I think it doesn't matter
There's a couple of single-line-scopes we could shave off but any which way
Konrad
+ peterz for scoped_cond_guard() question at the bottom
Quoted 7 lines · Konrad Dybcio
Quoted 5 lines · Rob Clark
Convert (most of) the
msm_gem_lock()and friends over to scope based cleanup.Other than fixing a lock leak in
msm_ioctl_gem_info_set_metadata()there should be no functional change.
oh, I meant to drop the 2nd para, since it is no longer true after rebasing on Bart's fix
Quoted 7 lines
[...]
Quoted 4 lines
drivers/gpu/drm/msm/msm_drv.c +0
-0@@ -608,26 +600,20 @@ static int msm_ioctl_gem_info_get_metadata(struct drm_gem_object *obj,return 0 ; }
Quoted 6 lines
drivers/gpu/drm/msm/msm_drv.c static int msm_ioctl_gem_info_set_metadata(struct drm_gem_object *obj, · line 587
Quoted 3 lines
drivers/gpu/drm/msm/msm_drv.c +0
-3- ret =msm_gem_lock_interruptible (obj); -if (ret) -return ret;LLM is a bit grumpy since this no longer returns all of the return codes that it can but I think it doesn't matter
It is a bit odd that scoped_cond_guard() doesn't seem to have "proper" access to the original return code.. I think I could do:
scoped_cond_guard (gem_lock_intr, return PTR_ERR(scope.lock), obj)
not sure if that is an evil hack or not?
I've added peterz, if he has an opinion
BR,
-R
Quoted 6 lines
There's a couple of single-line-scopes we could shave off but any which way
Reviewed-by Konrad Dybcio <[email protected]>Konrad