hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: irq: set the correct node for VMAP stack

Browse Source 
[ Upstream commit 75b5e0bf90bffaca4b1f19114065dc59f5cc161f ]

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>
Link: https://lore.kernel.org/r/20231124031513.81548-1-shijie@os.amperecomputing.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Huang Shijie 2023-11-24 11:15:13 +08:00 committed by Greg Kroah-Hartman
parent d482d61025
commit 4431284f4a
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/kernel/irq.c
View File

@ -22,6 +22,7 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <asm/daifflags.h> #include <asm/daifflags.h>
#include <asm/exception.h> #include <asm/exception.h>
#include <asm/numa.h>
#include <asm/vmap_stack.h> #include <asm/vmap_stack.h>
#include <asm/softirq_stack.h> #include <asm/softirq_stack.h>
@ -50,13 +51,13 @@ static void init_irq_scs(void)
} }
#ifdef CONFIG_VMAP_STACK #ifdef CONFIG_VMAP_STACK
static void init_irq_stacks(void) static void __init init_irq_stacks(void)
{ {
int cpu; int cpu;
unsigned long *p; unsigned long *p;
for_each_possible_cpu(cpu) { 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; per_cpu(irq_stack_ptr, cpu) = p;
} }
} }

2
drivers/base/arch_numa.c
View File

@ -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; unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;
EXPORT_SYMBOL(__per_cpu_offset); 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]; return cpu_to_node_map[cpu];
} }

2
include/asm-generic/numa.h
View File

@ -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_set_distance(int from, int to, int distance);
void __init numa_free_distance(void); void __init numa_free_distance(void);
void __init early_map_cpu_to_node(unsigned int cpu, int nid); 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_store_cpu_info(unsigned int cpu);
void numa_add_cpu(unsigned int cpu); void numa_add_cpu(unsigned int cpu);
void numa_remove_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 numa_remove_cpu(unsigned int cpu) { }
static inline void arch_numa_init(void) { } static inline void arch_numa_init(void) { }
static inline void early_map_cpu_to_node(unsigned int cpu, int nid) { } 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 */ #endif /* CONFIG_NUMA */