Skip to content

Commit e3c9e94

Browse files
zhouzhouyi-hubgregkh
authored andcommitted
powerpc/64: Init jump labels before parse_early_param()
[ Upstream commit ca829e0 ] On 64-bit, calling jump_label_init() in setup_feature_keys() is too late because static keys may be used in subroutines of parse_early_param() which is again subroutine of early_init_devtree(). For example booting with "threadirqs": static_key_enable_cpuslocked(): static key '0xc000000002953260' used before call to jump_label_init() WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:166 static_key_enable_cpuslocked+0xfc/0x120 ... NIP static_key_enable_cpuslocked+0xfc/0x120 LR static_key_enable_cpuslocked+0xf8/0x120 Call Trace: static_key_enable_cpuslocked+0xf8/0x120 (unreliable) static_key_enable+0x30/0x50 setup_forced_irqthreads+0x28/0x40 do_early_param+0xa0/0x108 parse_args+0x290/0x4e0 parse_early_options+0x48/0x5c parse_early_param+0x58/0x84 early_init_devtree+0xd4/0x518 early_setup+0xb4/0x214 So call jump_label_init() just before parse_early_param() in early_init_devtree(). Suggested-by: Michael Ellerman <[email protected]> Signed-off-by: Zhouyi Zhou <[email protected]> [mpe: Add call trace to change log and minor wording edits.] Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sasha Levin <[email protected]>
1 parent ecdba23 commit e3c9e94

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

arch/powerpc/kernel/prom.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,13 @@ void __init early_init_devtree(void *params)
751751
of_scan_flat_dt(early_init_dt_scan_root, NULL);
752752
of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL);
753753

754+
/*
755+
* As generic code authors expect to be able to use static keys
756+
* in early_param() handlers, we initialize the static keys just
757+
* before parsing early params (it's fine to call jump_label_init()
758+
* more than once).
759+
*/
760+
jump_label_init();
754761
parse_early_param();
755762

756763
/* make sure we've parsed cmdline for mem= before this */

0 commit comments

Comments
 (0)