[PATCH] drm/i915: Correct error handler

[PATCH] drm/i915: Correct error handler

[Jiasheng Jiang]

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 <jiashengjiangcool@outlook.com>
---
 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

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

[Nirmoy Das]

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: <stable@vger.kernel.org> # v5.2+

With those:

Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>


Nirmoy

> Signed-off-by: Jiasheng Jiang <jiashengjiangcool@outlook.com>
> ---
>   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;
>   }

[PATCH] drm/i915: Correct error handler

[Jiasheng Jiang]

> 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: <stable@vger.kernel.org> # v5.2+
> 
> With those:
> 
> Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
> 
> 
> Nirmoy

Thanks.
I will submit a v2.

- Jiasheng

[PATCH] drm/i915: Correct error handler

[Jiasheng Jiang]

> 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: <stable@vger.kernel.org> # v5.2+
> 
> With those:
> 
> Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
> 
> 
> Nirmoy

Thanks.
I will submit a v2.

- Jiasheng

[PATCH] drm/i915: Correct error handler

[Jiasheng Jiang]

From: Jiasheng Jiang <jiasheng@purdue.edu>

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 <jiasheng@purdue.edu>
---
 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

[PATCH] drm/i915: Correct error handler

[Jiasheng Jiang]

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 <jiasheng@purdue.edu>
---
 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

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

[Jiasheng Jiang]

Maybe the format is incorrect. I would like to use "jiashengjiangcool@outlook.com" to resend my patch.

-Jiasheng

________________________________________
From: Jiasheng Jiang
Sent: Saturday, May 11, 2024 3:40
To: jani.nikula@linux.intel.com; joonas.lahtinen@linux.intel.com; rodrigo.vivi@intel.com; tursulin@ursulin.net; airlied@gmail.com; daniel@ffwll.ch; chris@chris-wilson.co.uk
Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-kernel@vger.kernel.org
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 <jiasheng@purdue.edu>
---
 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