Skip to content

Commit 1fd8de4

Browse files
anadavIngo Molnar
authored andcommitted
x86/jump_label: Use text_poke_early() during early init
There is no apparent reason not to use text_poke_early() during early-init, since no patching of code that might be on the stack is done and only a single core is running. This is required for the next patches that would set a temporary mm for text poking, and this mm is only initialized after some static-keys are enabled/disabled. Signed-off-by: Nadav Amit <namit@vmware.com> Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: <akpm@linux-foundation.org> Cc: <ard.biesheuvel@linaro.org> Cc: <deneen.t.dock@intel.com> Cc: <kernel-hardening@lists.openwall.com> Cc: <kristen@linux.intel.com> Cc: <linux_dti@icloud.com> Cc: <will.deacon@arm.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Kees Cook <keescook@chromium.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Rik van Riel <riel@surriel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20190426001143.4983-3-namit@vmware.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent c7b6f29 commit 1fd8de4

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

arch/x86/kernel/jump_label.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@ static void __ref __jump_label_transform(struct jump_entry *entry,
5050
jmp.offset = jump_entry_target(entry) -
5151
(jump_entry_code(entry) + JUMP_LABEL_NOP_SIZE);
5252

53-
if (early_boot_irqs_disabled)
53+
/*
54+
* As long as only a single processor is running and the code is still
55+
* not marked as RO, text_poke_early() can be used; Checking that
56+
* system_state is SYSTEM_BOOTING guarantees it.
57+
*/
58+
if (system_state == SYSTEM_BOOTING)
5459
poker = text_poke_early;
5560

5661
if (type == JUMP_LABEL_JMP) {

0 commit comments

Comments
 (0)