5.15-stable patches

added patches:
	arm64-irq-set-the-correct-node-for-shadow-call-stack.patch

diff --git a/queue-5.15/arm64-irq-set-the-correct-node-for-shadow-call-stack.patch b/queue-5.15/arm64-irq-set-the-correct-node-for-shadow-call-stack.patch
new file mode 100644 (file)
index 0000000..460796e
--- /dev/null
+++ b/queue-5.15/arm64-irq-set-the-correct-node-for-shadow-call-stack.patch
@@ -0,0 +1,38 @@
+From 7b1a09e44dc64f4f5930659b6d14a27183c00705 Mon Sep 17 00:00:00 2001
+From: Huang Shijie <shijie@os.amperecomputing.com>
+Date: Wed, 13 Dec 2023 09:20:46 +0800
+Subject: arm64: irq: set the correct node for shadow call stack
+
+From: Huang Shijie <shijie@os.amperecomputing.com>
+
+commit 7b1a09e44dc64f4f5930659b6d14a27183c00705 upstream.
+
+The init_irq_stacks() has been changed to use the correct node:
+https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/commit/?id=75b5e0bf90bf
+
+The init_irq_scs() has the same issue with init_irq_stacks():
+       cpu_to_node() is not initialized yet, it does not work.
+
+This patch uses early_cpu_to_node() to set the init_irq_scs()
+with the correct node.
+
+Signed-off-by: Huang Shijie <shijie@os.amperecomputing.com>
+Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
+Link: https://lore.kernel.org/r/20231213012046.12014-1-shijie@os.amperecomputing.com
+Signed-off-by: Will Deacon <will@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/kernel/irq.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/kernel/irq.c
++++ b/arch/arm64/kernel/irq.c
+@@ -45,7 +45,7 @@ static void init_irq_scs(void)
+ 
+       for_each_possible_cpu(cpu)
+               per_cpu(irq_shadow_call_stack_ptr, cpu) =
+-                      scs_alloc(cpu_to_node(cpu));
++                      scs_alloc(early_cpu_to_node(cpu));
+ }
+ 
+ #ifdef CONFIG_VMAP_STACK

diff --git a/queue-5.15/series b/queue-5.15/series
index ff0fbad4fe2a98374ec6d342e22d212f99761047..660b3f928cf93ff469ee73e95581ff006ebd7b75 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -293,3 +293,4 @@ net-ipv4-fix-a-memleak-in-ip_setup_cork.patch
 af_unix-fix-lockdep-positive-in-sk_diag_dump_icons.patch
 selftests-net-fix-available-tunnels-detection.patch
 net-sysfs-fix-sys-class-net-iface-path.patch
+arm64-irq-set-the-correct-node-for-shadow-call-stack.patch