FAILED: patch "[PATCH] drm/i915: Fix memory leak by correcting cache object name in" failed to apply to 5.10-stable tree

FAILED: patch "[PATCH] drm/i915: Fix memory leak by correcting cache object name in" failed to apply to 5.10-stable tree

[gregkh]

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 2828e5808bcd5aae7fdcd169cac1efa2701fa2dd
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024121517-deserve-wharf-c2d0@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..

Possible dependencies:



thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 2828e5808bcd5aae7fdcd169cac1efa2701fa2dd Mon Sep 17 00:00:00 2001
From: Jiasheng Jiang <jiashengjiangcool@outlook.com>
Date: Wed, 27 Nov 2024 20:10:42 +0000
Subject: [PATCH] drm/i915: Fix memory leak by correcting cache object name in
 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")
Cc: <stable@vger.kernel.org> # v5.2+
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@outlook.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241127201042.29620-1-jiashengjiangcool@gmail.com
(cherry picked from commit 9bc5e7dc694d3112bbf0fa4c46ef0fa0f114937a)
Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>

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;
 }

Re: FAILED: patch "[PATCH] drm/i915: Fix memory leak by correcting cache object name in" failed to apply to 5.10-stable tree

[Andi Shyti]

Hi Jiasheng,

On Sun, Dec 15, 2024 at 09:33:17AM +0100, gregkh@linuxfoundation.org wrote:
> The patch below does not apply to the 5.10-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.

Could you please fix the backport to 5.10 and 5.4 as they are not
applying cleanly?

Thanks,
Andi

[PATCH 5.10.y] drm/i915: Fix memory leak by correcting cache object name in 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@gmail.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 cbb880b10c65..a58b70444abd 100644
--- a/drivers/gpu/drm/i915/i915_scheduler.c
+++ b/drivers/gpu/drm/i915/i915_scheduler.c
@@ -538,6 +538,6 @@ int __init i915_global_scheduler_init(void)
 	return 0;
 
 err_priorities:
-	kmem_cache_destroy(global.slab_priorities);
+	kmem_cache_destroy(global.slab_dependencies);
 	return -ENOMEM;
 }
-- 
2.25.1

Re: [PATCH 5.10.y] drm/i915: Fix memory leak by correcting cache object name in error handler

[Sasha Levin]

[ Sasha's backport helper bot ]

Hi,

Found matching upstream commit: 2828e5808bcd5aae7fdcd169cac1efa2701fa2dd

WARNING: Author mismatch between patch and found commit:
Backport author: Jiasheng Jiang <jiashengjiangcool@gmail.com>
Commit author: Jiasheng Jiang <jiashengjiangcool@outlook.com>


Status in newer kernel trees:
6.12.y | Present (different SHA1: 1c7f63e645a9)
6.6.y | Present (different SHA1: c98cff29e48f)
6.1.y | Present (different SHA1: 237fe21e40c7)
5.15.y | Present (different SHA1: a4d0c3c28c3b)
5.10.y | Not found

Note: The patch differs from the upstream commit:
---
1:  2828e5808bcd < -:  ------------ drm/i915: Fix memory leak by correcting cache object name in error handler
-:  ------------ > 1:  e0b528005793 drm/i915: Fix memory leak by correcting cache object name in error handler
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y       |  Success    |  Success   |

Re: [PATCH 5.10.y] drm/i915: Fix memory leak by correcting cache object name in error handler

[Greg KH]

On Mon, Dec 16, 2024 at 04:18:40PM +0000, Jiasheng Jiang wrote:
> 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@gmail.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 cbb880b10c65..a58b70444abd 100644
> --- a/drivers/gpu/drm/i915/i915_scheduler.c
> +++ b/drivers/gpu/drm/i915/i915_scheduler.c
> @@ -538,6 +538,6 @@ int __init i915_global_scheduler_init(void)
>  	return 0;
>  
>  err_priorities:
> -	kmem_cache_destroy(global.slab_priorities);
> +	kmem_cache_destroy(global.slab_dependencies);
>  	return -ENOMEM;
>  }
> -- 
> 2.25.1

What is the git commit id of this change?

Re: [PATCH 5.10.y] drm/i915: Fix memory leak by correcting cache object name in error handler

[Greg KH]

On Mon, Dec 16, 2024 at 04:18:40PM +0000, Jiasheng Jiang wrote:
> 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@gmail.com>

You also forgot to keep all the original signed-off-by lines, and cc:
them :(

I've fixed it up, but next time be more careful please.

thanks,

greg k-h

Re: FAILED: patch "[PATCH] drm/i915: Fix memory leak by correcting cache object name in" failed to apply to 5.10-stable tree

[Andi Shyti]

Hi Jiasheng,

> Yes. I have submitted the patch for 5.10 to stable@vger.kernel.org.

Thank you!

Andi

Re: [PATCH 5.10.y] drm/i915: Fix memory leak by correcting cache object name in error handler

[Jiasheng Jiang]

Hi Greg,

On Tue, Dec 17, 2024 at 4:01 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Mon, Dec 16, 2024 at 04:18:40PM +0000, Jiasheng Jiang wrote:
> > 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@gmail.com>
>
> You also forgot to keep all the original signed-off-by lines, and cc:
> them :(
>
> I've fixed it up, but next time be more careful please.
>
> thanks,
>
> greg k-h

Sorry for that. I will add these lines in the patch for 5.4.

-Jiasheng