Skip to content

Commit 5cc2db3

Browse files
andyhhpbp3tk0v
authored andcommitted
x86/static-call: Remove early_boot_irqs_disabled check to fix Xen PVH dom0
__static_call_update_early() has a check for early_boot_irqs_disabled, but is used before early_boot_irqs_disabled is set up in start_kernel(). Xen PV has always special cased early_boot_irqs_disabled, but Xen PVH does not and falls over the BUG when booting as dom0. It is very suspect that early_boot_irqs_disabled starts as 0, becomes 1 for a time, then becomes 0 again, but as this needs backporting to fix a breakage in a security fix, dropping the BUG_ON() is the far safer option. Fixes: 0ef8047 ("x86/static-call: provide a way to do very early static-call updates") Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219620 Reported-by: Alex Zenla <[email protected]> Suggested-by: Peter Zijlstra <[email protected]> Signed-off-by: Andrew Cooper <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Juergen Gross <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Tested-by: Alex Zenla <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent fc033cf commit 5cc2db3

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

arch/x86/kernel/static_call.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ EXPORT_SYMBOL_GPL(arch_static_call_transform);
175175
noinstr void __static_call_update_early(void *tramp, void *func)
176176
{
177177
BUG_ON(system_state != SYSTEM_BOOTING);
178-
BUG_ON(!early_boot_irqs_disabled);
179178
BUG_ON(static_call_initialized);
180179
__text_gen_insn(tramp, JMP32_INSN_OPCODE, tramp, func, JMP32_INSN_SIZE);
181180
sync_core();

0 commit comments

Comments
 (0)