drm/pagemap_util: Ensure proper cache lock management on free
Subsystems (3)
PATCH 1/1 drm/pagemap_util: Ensure proper cache lock management on free
Static analysis issue:
Though probably unnecessary given the cache is being freed at this step, for the sake of consistency, ensure that the cache lock is always unlocked after drm_pagemap_cache_fini.
--- drivers/gpu/drm/drm_pagemap_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_pagemap_util.c +4 -4
@@ -65,18 +65,18 @@ static void drm_pagemap_cache_fini(void *arg)drm_dbg (cache->shrinker->drm,"Destroying dpagemap cache.\n" );spin_lock (&cache->lock); dpagemap = cache->dpagemap; -if (!dpagemap) { -spin_unlock (&cache->lock); +if (!dpagemap) goto out; - }if (drm_pagemap_shrinker_cancel (dpagemap)) { cache->dpagemap =NULL ;spin_unlock (&cache->lock);drm_pagemap_destroy (dpagemap, false); + }else { +out: +spin_unlock (&cache->lock); } -out:mutex_destroy (&cache->lookup_mutex);kfree (cache); }
Signature · 1 line
2.43.0
Maarten Lankhorst
maintainerDen 2026-02-20 kl. 20:09, skrev Jonathan Cavitt:
Quoted 32 lines
Static analysis issue:
Though probably unnecessary given the cache is being freed at this step, for the sake of consistency, ensure that the cache lock is always unlocked after
drm_pagemap_cache_fini.Fixes 77f14f2f2d73f ("drm/pagemap: Add a drm_pagemap cache and shrinker")Signed-off-by Jonathan Cavitt <[email protected]>Cc Thomas Hellstrom <[email protected]>Cc Matthew Brost <[email protected]>Cc Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/drm_pagemap_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/drm_pagemap_util.c +1
-3@@ -65,18 +65,18 @@ static void drm_pagemap_cache_fini(void *arg)drm_dbg (cache->shrinker->drm,"Destroying dpagemap cache.\n" );spin_lock (&cache->lock); dpagemap = cache->dpagemap; -if (!dpagemap) { -spin_unlock (&cache->lock); +if (!dpagemap) goto out; - }if (drm_pagemap_shrinker_cancel (dpagemap)) { cache->dpagemap =NULL ;spin_unlock (&cache->lock);
drivers/gpu/drm/drm_pagemap_util.c static void drm_pagemap_cache_fini(void *arg) · line 82
Quoted 10 lines
drivers/gpu/drm/drm_pagemap_util.c +3
-1drm_pagemap_destroy (dpagemap, false); + }else { +out: +spin_unlock (&cache->lock); } -out:mutex_destroy (&cache->lookup_mutex);kfree (cache); }
I think this flow without goto is slightly more readable:
spin_lock(&cache->lock); dpagemap = cache->dpagemap; cache->dpagemap = NULL; if (dpagemap && !drm_pagemap_shrinker_cancel(dpagemap)) dpagemap = NULL; spin_unlock(&cache->lock); if (dpagemap) drm_pagemap_destroy(dpagemap, false); mutex_destroy(&cache->lookup_mutex); kfree(cache); }
Although since we are freeing, it doesn't matter if cache->dpagemap stays assigned, so perhaps the cache->dpagemap = NULL assignment can be removed too.
Kind regards,
~Maarten Lankhorst