mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
75b5e0bf90
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>
55 lines
1.6 KiB
C
55 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __ASM_GENERIC_NUMA_H
|
|
#define __ASM_GENERIC_NUMA_H
|
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
#define NR_NODE_MEMBLKS (MAX_NUMNODES * 2)
|
|
|
|
int __node_distance(int from, int to);
|
|
#define node_distance(a, b) __node_distance(a, b)
|
|
|
|
extern nodemask_t numa_nodes_parsed __initdata;
|
|
|
|
extern bool numa_off;
|
|
|
|
/* Mappings between node number and cpus on that node. */
|
|
extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];
|
|
void numa_clear_node(unsigned int cpu);
|
|
|
|
#ifdef CONFIG_DEBUG_PER_CPU_MAPS
|
|
const struct cpumask *cpumask_of_node(int node);
|
|
#else
|
|
/* Returns a pointer to the cpumask of CPUs on Node 'node'. */
|
|
static inline const struct cpumask *cpumask_of_node(int node)
|
|
{
|
|
if (node == NUMA_NO_NODE)
|
|
return cpu_all_mask;
|
|
|
|
return node_to_cpumask_map[node];
|
|
}
|
|
#endif
|
|
|
|
void __init arch_numa_init(void);
|
|
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);
|
|
|
|
#else /* CONFIG_NUMA */
|
|
|
|
static inline void numa_store_cpu_info(unsigned int cpu) { }
|
|
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 */
|
|
|
|
#endif /* __ASM_GENERIC_NUMA_H */
|