From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 3 Feb 2024 00:52:44 +0000 (-0800)
Subject: 6.1-stable patches
X-Git-Tag: v6.1.77~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77910b9caddc051af5e582185801788c5321fb05;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

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

diff --git a/queue-6.1/arm64-irq-set-the-correct-node-for-shadow-call-stack.patch b/queue-6.1/arm64-irq-set-the-correct-node-for-shadow-call-stack.patch
new file mode 100644
index 00000000000..90dce7750be
--- /dev/null
+++ b/queue-6.1/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
+@@ -47,7 +47,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-6.1/series b/queue-6.1/series
index 9222aae6534..3381e4f9b28 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -211,3 +211,4 @@ selftests-net-fix-available-tunnels-detection.patch
 net-sysfs-fix-sys-class-net-iface-path.patch
 selftests-team-add-missing-config-options.patch
 selftests-bonding-check-initial-state.patch
+arm64-irq-set-the-correct-node-for-shadow-call-stack.patch