Messages in this thread | | | Date | Fri, 17 Nov 2023 10:50:56 +0800 | Subject | Re: [PATCH] arm64: irq: set the correct node for VMAP stack | From | Shijie Huang <> |
| |
Hi Catalin,
在 2023/11/17 1:18, Catalin Marinas 写道: > On Tue, Nov 14, 2023 at 05:16:43PM +0800, Huang Shijie wrote: >> diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c >> index 6ad5c6ef5329..e62d3cb3f74c 100644 >> --- a/arch/arm64/kernel/irq.c >> +++ b/arch/arm64/kernel/irq.c >> @@ -57,7 +57,7 @@ static void init_irq_stacks(void) >> 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; >> } >> } > This looks alright to me, I don't have a better suggestion. The generic > code already has the cpu_to_node_map[] array populated by > early_map_cpu_to_node(), so let's reuse it. > >> diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c >> index eaa31e567d1e..90519d981471 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 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..fc8a9bd6a444 100644 >> --- a/include/asm-generic/numa.h >> +++ b/include/asm-generic/numa.h >> @@ -38,6 +38,7 @@ void __init early_map_cpu_to_node(unsigned int cpu, int nid); >> void numa_store_cpu_info(unsigned int cpu); >> void numa_add_cpu(unsigned int cpu); >> void numa_remove_cpu(unsigned int cpu); >> +int early_cpu_to_node(int cpu); > Here I'd move this just below early_map_cpu_to_node() and, for > completeness, also add the dummy static inline for the !NUMA case.
Thanks a lot. It seems there is no need for me to send the V2 for this.
Thanks
Huang Shijie
| |