Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
From:   Huang Shijie <shijie@os.amperecomputing.com>
To:     catalin.marinas@arm.com
Cc:     will@kernel.org, gregkh@linuxfoundation.org, rafael@kernel.org,
        arnd@arndb.de, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
        Huang Shijie <shijie@os.amperecomputing.com>
Subject: [PATCH v4] arm64: irq: set the correct node for VMAP stack
Date:   Fri, 24 Nov 2023 11:15:13 +0800
Message-Id: <20231124031513.81548-1-shijie@os.amperecomputing.com>
In-Reply-To: <ZV-EA46rBJ9WK4UH@arm.com>
References: <ZV-EA46rBJ9WK4UH@arm.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Oo16UmguACxF1IBAwcY3BB+j1ptMBo32AmusLeEMHJLDeJzdnbhVBctWNwdt?=
 =?us-ascii?Q?ULcYW8aXHH6YkpSc1AKTv4GjwUxub3i28/TJEkCe+4LpPAL2Y8NyB3DkkStP?=
 =?us-ascii?Q?AUb6U3Uo388v0Rk9olt+aucJxb1S9O7FYbNJfKfy0gxZrPtTPQbGNWzDxhUT?=
 =?us-ascii?Q?EkatqTv8aZGwketz8S6bPpfmUmiNFEBiwhWSu9dNmvK8fWxGjyv79K5ca+fJ?=
 =?us-ascii?Q?jGYdMOBZZRGhqi8r6rRNzetE3G8/P9UWiF5vZ98trtjv4gZMarXFnzbseJur?=
 =?us-ascii?Q?0dcoB+RyqsqxE04GJEX2qiEOSfrNnp9jyuevINCHuJ1R7SJCFKDki1aRViAf?=
 =?us-ascii?Q?MrrvqKH+gOx3XtFW0kG2I8H/RP0QovDm7gna2iikiRHuv48gZr1iSElmf0I0?=
 =?us-ascii?Q?HPDFwgpwOhDRXzeH3rrwh/ZjgqW2gHXTt8fvN+9gOaHZQTPw9FCFLl+KL3oE?=
 =?us-ascii?Q?uum9kSMFXJ7TddWJsLkZZNh4H4U5r1awRzCTy1iZTv2Zw5SjB7gTtFTjAxFC?=
 =?us-ascii?Q?AIaeM6S6fYHEIifYnOexmOdHWyevd/BoV7RWfceMRdS7to8tHmJWFnaNmoiH?=
 =?us-ascii?Q?67CZnq/l3g68VloWlRv9XfETxXaWtznz1vBUWbFBblBh+aJhG0FAQ2bGSjvD?=
 =?us-ascii?Q?q5wicIJwRmg9375xLH2k5/z4evzF/PGCmpGANCVPdgSDjdYXzvQOYaEeipul?=
 =?us-ascii?Q?9H9faLFXjOna2644N/khVztBfuLgXef3ASlA9dc4AJFLIiwy8T422yNvvH/O?=
 =?us-ascii?Q?sTbY2bHG54oKDFOMX2WJnVRfdXUvUWBtAePQ2hPh9vFSFP0+5ExIu5YDTqXz?=
 =?us-ascii?Q?k/tME9+y+b4k/hGJUZ6Fwqo8m/m3mXifEzWDx/DqsEQROyJPo2CxEfow+cqI?=
 =?us-ascii?Q?oBYQKSjAs3MUbeJ8qY2hXEKhLWl7EEXolBfpknk7XDpFkyM4K12m6zmRuaEM?=
 =?us-ascii?Q?aSZqmvOulfpn0ezEHJxpHIwM8MEnTwb1XisawtCZtJ22dzXeAjVWiSVQ/stM?=
 =?us-ascii?Q?gz00Tu4jiOyi5vE53/hIHwWtvhTYfBGAVaN5JM7xAxiVj4QwLEWve7N2U4wI?=
 =?us-ascii?Q?E1VQE/+2j++aZnUdaHckQrhUCcMwWN5oCqCL6voxP3RVcUOmkoFncFthNohH?=
 =?us-ascii?Q?EJE7Ynqg/5EfwQsPVHCsgtaxHjbCqP2K5kGUnRtW0xknsIaGxtOy2mysIVNb?=
 =?us-ascii?Q?VDTt0jDsP4O0d/u/Eb9ESp2J1Uif0jTfhPshUoM1NWOjYa0HDmmnYk6M1SWk?=
 =?us-ascii?Q?9ktlXxIOt2d+Cp0hjKNYUBLXTP1QAetzsuLFFFxu1l84v6I5IjF6AEkq2tWN?=
 =?us-ascii?Q?Wfd5Jmu4CeCbDAHb6p46Ue8QJoCI7oUr7KCabcV47UPF+ccs/vTYjMAbCWQZ?=
 =?us-ascii?Q?Qn7yJ62zK9F2RcUHWnoz/hm0q0Bv/swMtH0d2cg5ZO+DgFUvOa2KK0/a9dom?=
 =?us-ascii?Q?tFY36Dga0ZqmJtCDUf5cg+ZTY7wvw5CQwcbs8cVvMJMLRFNSjJi4ZcboRsW/?=
 =?us-ascii?Q?8gvLe/2XgDa8JyUDTD5Wey+Tp0CB6kd79VoOSge0o/643zKqqxy3j54VIL+k?=
 =?us-ascii?Q?CguJDpEGxH6J4zqlWjKwb6FCAkNu6FIZAQEOLi86R+3y6jqaZR5MuSQofyGT?=
 =?us-ascii?Q?2QcaSxzrK770QKgY0njJXd0=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 89449542-e180-4de6-dd50-08dbec9ba416
X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB7975.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2023 03:15:42.1577
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Qy5GGw4rt24749QG8bw1sO3/f4mCKegzKvKZ3C+IqV/h9+eb0E10bpOLGRfqxsq4AwC2gvx05T0Ey3xbyES02uH3lKoDYbikqCgKGzDZt5CHa5KM/pUMUHCDvYvUPHOg
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR01MB6102
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Thu, 23 Nov 2023 19:16:24 -0800 (PST)

In current code, init_irq_stacks() will call cpu_to_node().
The cpu_to_node() depends on percpu "numa_node" which is initialized in:
     arch_call_rest_init() --> rest_init() -- kernel_init()
	--> kernel_init_freeable() --> smp_prepare_cpus()

But init_irq_stacks() is called in init_IRQ() which is before
arch_call_rest_init().

So in init_irq_stacks(), the cpu_to_node() does not work, it
always return 0. In NUMA, it makes the node 1 cpu accesses the IRQ stack which
is in the node 0.

This patch fixes it by:
  1.) export the early_cpu_to_node(), and use it in the init_irq_stacks().
  2.) change init_irq_stacks() to __init function.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>  
Signed-off-by: Huang Shijie <shijie@os.amperecomputing.com>
---
v3 --> v4:
	1.) keep early_cpu_to_node() as __init function.
	2.) change init_irq_stacks() to __init function.

---
 arch/arm64/kernel/irq.c    | 5 +++--
 drivers/base/arch_numa.c   | 2 +-
 include/asm-generic/numa.h | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c
index 6ad5c6ef5329..9f253d8efe90 100644
--- a/arch/arm64/kernel/irq.c
+++ b/arch/arm64/kernel/irq.c
@@ -22,6 +22,7 @@
 #include <linux/vmalloc.h>
 #include <asm/daifflags.h>
 #include <asm/exception.h>
+#include <asm/numa.h>
 #include <asm/softirq_stack.h>
 #include <asm/stacktrace.h>
 #include <asm/vmap_stack.h>
@@ -51,13 +52,13 @@ static void init_irq_scs(void)
 }
 
 #ifdef CONFIG_VMAP_STACK
-static void init_irq_stacks(void)
+static void __init init_irq_stacks(void)
 {
 	int cpu;
 	unsigned long *p;
 
 	for_each_possible_cpu(cpu) {
-		p = arch_alloc_vmap_stack(IRQ_STACK_SIZE, cpu_to_node(cpu));
+		p = arch_alloc_vmap_stack(IRQ_STACK_SIZE, early_cpu_to_node(cpu));
 		per_cpu(irq_stack_ptr, cpu) = p;
 	}
 }
diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c
index eaa31e567d1e..5b59d133b6af 100644
--- a/drivers/base/arch_numa.c
+++ b/drivers/base/arch_numa.c
@@ -144,7 +144,7 @@ void __init early_map_cpu_to_node(unsigned int cpu, int nid)
 unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;
 EXPORT_SYMBOL(__per_cpu_offset);
 
-static int __init early_cpu_to_node(int cpu)
+int __init early_cpu_to_node(int cpu)
 {
 	return cpu_to_node_map[cpu];
 }
diff --git a/include/asm-generic/numa.h b/include/asm-generic/numa.h
index 1a3ad6d29833..c32e0cf23c90 100644
--- a/include/asm-generic/numa.h
+++ b/include/asm-generic/numa.h
@@ -35,6 +35,7 @@ int __init numa_add_memblk(int nodeid, u64 start, u64 end);
 void __init numa_set_distance(int from, int to, int distance);
 void __init numa_free_distance(void);
 void __init early_map_cpu_to_node(unsigned int cpu, int nid);
+int __init early_cpu_to_node(int cpu);
 void numa_store_cpu_info(unsigned int cpu);
 void numa_add_cpu(unsigned int cpu);
 void numa_remove_cpu(unsigned int cpu);
@@ -46,6 +47,7 @@ static inline void numa_add_cpu(unsigned int cpu) { }
 static inline void numa_remove_cpu(unsigned int cpu) { }
 static inline void arch_numa_init(void) { }
 static inline void early_map_cpu_to_node(unsigned int cpu, int nid) { }
+static inline int early_cpu_to_node(int cpu) { return 0; }
 
 #endif	/* CONFIG_NUMA */
 
-- 
2.40.1