powerpc/mce: mce_init use early_cpu_to_node
Subsystems (2)
Nicholas Piggin
reviewerPATCH 1/2 powerpc/mce: mce_init use early_cpu_to_node
cpu_to_node is not available (setup_arch() is called before setup_per_cpu_areas() by start_kernel()).
--- arch/powerpc/kernel/mce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/mce.c +1 -1
@@ -756,7 +756,7 @@ void __init mce_init(void) mce_info =memblock_alloc_try_nid (sizeof (*mce_info), __alignof__(*mce_info),MEMBLOCK_LOW_LIMIT , - limit,cpu_to_node (i)); + limit,early_cpu_to_node (i));if (!mce_info) goto err; paca_ptrs[i]->mce_info = mce_info;
Signature · 1 line
2.35.1
Nicholas Piggin
reviewerPATCH 2/2 powerpc/64: poison __per_cpu_offset to catch use-before-init
If the boot CPU tries to access per-cpu data of other CPUs before per cpu areas are set up, it will unexpectedly use offset 0.
Try to catch such accesses by poisoning the __per_cpu_offset array.
--- arch/powerpc/include/asm/percpu.h | 1 + arch/powerpc/kernel/paca.c | 2 +- arch/powerpc/kernel/setup_64.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/percpu.h +1 -0
@@ -7,6 +7,7 @@* Same as asm-generic/percpu.h, except that we store the per cpu offset * in the paca. Based on the x86-64 implementation. */ +#define PER_CPU_OFFSET_POISON 0xfeeeeeeeeeeeeeeeULL#ifdef CONFIG_SMP
arch/powerpc/kernel/paca.c +1 -1
@@ -223,7 +223,7 @@ void __init initialise_paca(struct paca_struct *new_paca, int cpu) new_paca->hw_cpu_id =0xffff ; new_paca->kexec_state =KEXEC_STATE_NONE ; new_paca->__current = &init_task; - new_paca->data_offset =0xfeeeeeeeeeeeeeeeULL ; + new_paca->data_offset =PER_CPU_OFFSET_POISON ;#ifdef CONFIG_PPC_64S_HASH_MMU new_paca->slb_shadow_ptr =NULL ;#endif
arch/powerpc/kernel/setup_64.c +1 -1
@@ -812,7 +812,7 @@ static __init int pcpu_cpu_to_node(int cpu)return early_cpu_to_node (cpu); } -unsigned long __per_cpu_offset[NR_CPUS ]__read_mostly ; +unsigned long __per_cpu_offset[NR_CPUS ]__read_mostly = { [0 ...NR_CPUS -1 ] =PER_CPU_OFFSET_POISON };EXPORT_SYMBOL (__per_cpu_offset);void __init setup_per_cpu_areas (void )
Signature · 1 line
2.35.1
Michael Ellerman
reviewerRe: [PATCH 2/2] powerpc/64: poison __per_cpu_offset to catch use-before-init
Quoted 4 lines · Nicholas Piggin
If the boot CPU tries to access per-cpu data of other CPUs before per cpu areas are set up, it will unexpectedly use offset 0.
Try to catch such accesses by poisoning the
__per_cpu_offsetarray.
I wasn't sure about this.
On bare metal it's just an instant checkstop which is very user hostile.
I worry it's just going to cause unusual configurations/options to crash for folks, like eg. booting with page_poison=1 did a while back.
Can we put it behind a debug option? Maybe CONFIG_DEBUG_VM ?
cheers
Quoted 4 lines · Nicholas Piggin
cpu_to_nodeis not available (setup_arch()is called beforesetup_per_cpu_areas()bystart_kernel()).
Patch 1 applied to powerpc/next.
[1/2] powerpc/mce: mce_init use early_cpu_to_node
https://git.kernel.org/powerpc/c/f57261e69825b332f22480b37a33e03d066c0da2
cheers