drm/msm/gem: Add some cleanup.h
Subsystems (4)
Rob Clark
maintainerPATCH 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.
--- drivers/gpu/drm/msm/msm_drv.c | 38 ++++++++------------------ 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 +- 5 files changed, 29 insertions(+), 62 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +12 -26
@@ -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,31 +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 out; +return -ENOMEM ; } msm_obj->metadata = new_metadata; msm_obj->metadata_size = metadata_size;memcpy (msm_obj->metadata, buf, metadata_size); -msm_gem_unlock (obj); - -out: -kfree (buf); - -return ret; +return 0 ; } static int msm_ioctl_gem_info_get_metadata(struct drm_gem_object *obj,
@@ -607,21 +600,14 @@ 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)) {
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
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] drm/msm: uninitialized return value in msm_ioctl_gem_info_get_metadata() --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] drm/msm: uninitialized return value in msm_ioctl_gem_info_get_metadata() --
commit 26d3997a404e96c83bc421df7eb395c717c9751f
Author: Rob Clark <[email protected]>
drm/msm/gem: Add some cleanup.h
This commit converts msm_gem_lock() and related locking helpers to use scope-based cleanup from cleanup.h, while also fixing a lock leak in msm_ioctl_gem_info_set_metadata().
Quoted 4 lines
drivers/gpu/drm/msm/msm_drv.c +0
-0
[ ... ]
Quoted 18 lines
drivers/gpu/drm/msm/msm_drv.c +3
-11@@ -607,21 +600,14 @@ 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;
drivers/gpu/drm/msm/msm_drv.c static int msm_ioctl_gem_info_get_metadata(struct drm_gem_object *obj, · line 613
Quoted 10 lines
drivers/gpu/drm/msm/msm_drv.c +3
-2+ 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)) {
[Severity: High]
Does msm_ioctl_gem_info_get_metadata() return an uninitialized ret on the success path?
Previously, ret was initialized to 0 by:
ret = msm_gem_lock_interruptible(obj);
With that replaced by scoped_cond_guard, when *metadata_size >= len and copy_to_user() succeeds, execution takes the final else branch without assigning ret:
drivers/gpu/drm/msm/msm_drv.c:msm_ioctl_gem_info_get_metadata() {
...
int ret, len;
...
if (*metadata_size < len) {
ret = -ETOOSMALL;
} else if (copy_to_user(metadata, buf, len)) {
ret = -EFAULT;
} else {
*metadata_size = len;
}
kfree(buf);
return ret;
}Should ret be initialized to 0 (or set to 0 in the else branch)?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 6 lines · Rob Clark
drivers/gpu/drm/msm/msm_drv.c | 38 ++++++++------------------ 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 +- 5 files changed, 29 insertions(+), 62 deletions(-)
Please consider adding the following to drivers/gpu/drm/msm/Makefile:
CONTEXT_ANALYSIS_msm.o := y
Thanks,
Bart.
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Rob,
kernel test robot noticed the following build warnings:
[auto build test WARNING on drm/drm-next]
[also build test WARNING on drm-i915/for-linux-next drm-i915/for-linux-next-fixes drm-tip/drm-tip linus/master v7.3 next-20261026] [cannot apply to drm-misc/drm-misc-next daeinki-drm-exynos/exynos-drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Rob-Clark/drm-msm-gem-Add-some-cleanup-h/20261026-143700 base: https://gitlab.freedesktop.org/drm/kernel.git drm-next patch link: https://lore.kernel.org/r/20261026213701.22126-1-robin.clark%40oss.qualcomm.com patch subject: [PATCH] drm/msm/gem: Add some cleanup.h config: x86_64-buildonly-randconfig-1005-20261027 (https://download.01.org/0day-ci/archive/20261027/[email protected]/config) compiler: clang version 22.1.8 (https://github.com/llvm/llvm-project ca7933e47d3a3451d81e72ac174dcb5aa28b59d1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20261027/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/msm/msm_drv.c:613:13: warning: variable 'ret' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
613 | } else if (copy_to_user(metadata, buf, len)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/msm/msm_drv.c:621:9: note: uninitialized use occurs here
621 | return ret;
| ^~~
drivers/gpu/drm/msm/msm_drv.c:613:9: note: remove the 'if' if its condition is always true
613 | } else if (copy_to_user(metadata, buf, len)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
614 | ret = -EFAULT;
615 | } else {
| ~~~~~~
616 | *metadata_size = len;
| ~~~~~~~~~~~~~~~~~~~~~
617 | }
| ~
drivers/gpu/drm/msm/msm_drv.c:588:9: note: initialize the variable 'ret' to silence this warning
588 | int ret, len;
| ^
| = 01 warning generated.
vim +613 drivers/gpu/drm/msm/msm_drv.c
9902cb999e4e91 Rob Clark 2023-11-06 581
9902cb999e4e91 Rob Clark 2023-11-06 582 static int msm_ioctl_gem_info_get_metadata(struct drm_gem_object *obj,
9902cb999e4e91 Rob Clark 2023-11-06 583 __user void *metadata,
9902cb999e4e91 Rob Clark 2023-11-06 584 u32 *metadata_size)
9902cb999e4e91 Rob Clark 2023-11-06 585 {
9902cb999e4e91 Rob Clark 2023-11-06 586 struct msm_gem_object *msm_obj = to_msm_bo(obj);
9902cb999e4e91 Rob Clark 2023-11-06 587 void *buf;
9902cb999e4e91 Rob Clark 2023-11-06 588 int ret, len;
9902cb999e4e91 Rob Clark 2023-11-06 589
9902cb999e4e91 Rob Clark 2023-11-06 590 if (!metadata) {
9902cb999e4e91 Rob Clark 2023-11-06 591 /*
9902cb999e4e91 Rob Clark 2023-11-06 592 * Querying the size is inherently racey, but
9902cb999e4e91 Rob Clark 2023-11-06 593 * EXT_external_objects expects the app to confirm
9902cb999e4e91 Rob Clark 2023-11-06 594 * via device and driver UUIDs that the exporter and
9902cb999e4e91 Rob Clark 2023-11-06 595 * importer versions match. All we can do from the
9902cb999e4e91 Rob Clark 2023-11-06 596 * kernel side is check the length under obj lock
9902cb999e4e91 Rob Clark 2023-11-06 597 * when userspace tries to retrieve the metadata
9902cb999e4e91 Rob Clark 2023-11-06 598 */
9902cb999e4e91 Rob Clark 2023-11-06 599 *metadata_size = msm_obj->metadata_size;
9902cb999e4e91 Rob Clark 2023-11-06 600 return 0;
9902cb999e4e91 Rob Clark 2023-11-06 601 }
9902cb999e4e91 Rob Clark 2023-11-06 602
fec06716d04d17 Rob Clark 2026-10-26 603 scoped_cond_guard (gem_lock_intr, return -EINTR, obj) {
fec06716d04d17 Rob Clark 2026-10-26 604 /* Avoid copy_to_user() under gem obj lock by making a copy: */
9902cb999e4e91 Rob Clark 2023-11-06 605 len = msm_obj->metadata_size;
9902cb999e4e91 Rob Clark 2023-11-06 606 buf = kmemdup(msm_obj->metadata, len, GFP_KERNEL);
fec06716d04d17 Rob Clark 2026-10-26 607 if (!buf)
47cbfe2608314b Yasuaki Torimaru 2026-03-25 608 return -ENOMEM;
47cbfe2608314b Yasuaki Torimaru 2026-03-25 609 }
47cbfe2608314b Yasuaki Torimaru 2026-03-25 610
9902cb999e4e91 Rob Clark 2023-11-06 611 if (*metadata_size < len) {
9902cb999e4e91 Rob Clark 2023-11-06 612 ret = -ETOOSMALL;
9902cb999e4e91 Rob Clark 2023-11-06 @613 } else if (copy_to_user(metadata, buf, len)) {
9902cb999e4e91 Rob Clark 2023-11-06 614 ret = -EFAULT;
9902cb999e4e91 Rob Clark 2023-11-06 615 } else {
9902cb999e4e91 Rob Clark 2023-11-06 616 *metadata_size = len;
9902cb999e4e91 Rob Clark 2023-11-06 617 }
9902cb999e4e91 Rob Clark 2023-11-06 618
9902cb999e4e91 Rob Clark 2023-11-06 619 kfree(buf);
9902cb999e4e91 Rob Clark 2023-11-06 620
47cbfe2608314b Yasuaki Torimaru 2026-03-25 621 return ret;
9902cb999e4e91 Rob Clark 2023-11-06 622 }
9902cb999e4e91 Rob Clark 2023-11-06 623 --
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki