2024-05-11 15:49:26

by Jiasheng Jiang

Subject: [PATCH] drm/i915: Correct error handler

Replace "slab_priorities" with "slab_dependencies" in the error handler to avoid memory leak.

Fixes: 32eb6bcfdda9 ("drm/i915: Make request allocation caches global")
Signed-off-by: Jiasheng Jiang <[email protected]>
---
drivers/gpu/drm/i915/i915_scheduler.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c
index 762127dd56c5..70a854557e6e 100644
--- a/drivers/gpu/drm/i915/i915_scheduler.c
+++ b/drivers/gpu/drm/i915/i915_scheduler.c
@@ -506,6 +506,6 @@ int __init i915_scheduler_module_init(void)
return 0;

err_priorities:
- kmem_cache_destroy(slab_priorities);
+ kmem_cache_destroy(slab_dependencies);
return -ENOMEM;
}
--
2.25.1

2024-05-13 07:27:30

by Nirmoy Das

Subject: Re: [PATCH] drm/i915: Correct error handler

On 5/11/2024 5:48 PM, Jiasheng Jiang wrote:
> Replace "slab_priorities" with "slab_dependencies" in the error handler to avoid memory leak.

Nice catch. I would make the subject more like:

drm/i915: Fix memory leak by correcting cache object name in error handler

>
> Fixes: 32eb6bcfdda9 ("drm/i915: Make request allocation caches global")

Also need Cc: <[email protected]> # v5.2+

With those:

Reviewed-by: Nirmoy Das <[email protected]>


Nirmoy

> Signed-off-by: Jiasheng Jiang <[email protected]>
> ---
> drivers/gpu/drm/i915/i915_scheduler.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c
> index 762127dd56c5..70a854557e6e 100644
> --- a/drivers/gpu/drm/i915/i915_scheduler.c
> +++ b/drivers/gpu/drm/i915/i915_scheduler.c
> @@ -506,6 +506,6 @@ int __init i915_scheduler_module_init(void)
> return 0;
>
> err_priorities:
> - kmem_cache_destroy(slab_priorities);
> + kmem_cache_destroy(slab_dependencies);
> return -ENOMEM;
> }