Messages in this thread Patch in this message | | | From | Daniel Bristot de Oliveira <> | Subject | [RFC PATCH 4/6] x86/jump_label: Add __jump_label_set_jump_code() helper | Date | Mon, 8 Oct 2018 14:53:03 +0200 |
| |
Move the definition of the code to be written from __jump_label_transform() to a specialized function.
Signed-off-by: Daniel Bristot de Oliveira <bristot@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Pavel Tatashin <pasha.tatashin@oracle.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org> Cc: Zhou Chengming <zhouchengming1@huawei.com> Cc: Jiri Kosina <jkosina@suse.cz> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org> Cc: Chris von Recklinghausen <crecklin@redhat.com> Cc: Jason Baron <jbaron@akamai.com> Cc: Scott Wood <swood@redhat.com> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Clark Williams <williams@redhat.com> Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org --- arch/x86/kernel/jump_label.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c index a11d836d9aaa..de588ff47f81 100644 --- a/arch/x86/kernel/jump_label.c +++ b/arch/x86/kernel/jump_label.c @@ -88,6 +88,22 @@ static inline void __jump_label_disabling_check(struct jump_entry *entry, } } +static void __jump_label_set_jump_code(struct jump_entry *entry, + enum jump_label_type type, + int init, + union jump_code_union *code) +{ + if (type == JUMP_LABEL_JMP) { + __jump_label_enabling_check(entry, type, init); + + code->jump = 0xe9; + code->offset = entry->target - (entry->code + JUMP_LABEL_NOP_SIZE); + } else { + __jump_label_disabling_check(entry, type, init); + memcpy(code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE); + } +} + static void __ref __jump_label_transform(struct jump_entry *entry, enum jump_label_type type, void *(*poker)(void *, const void *, size_t), @@ -98,16 +114,7 @@ static void __ref __jump_label_transform(struct jump_entry *entry, if (early_boot_irqs_disabled) poker = text_poke_early; - if (type == JUMP_LABEL_JMP) { - __jump_label_enabling_check(entry, type, init); - - code.jump = 0xe9; - code.offset = entry->target - - (entry->code + JUMP_LABEL_NOP_SIZE); - } else { - __jump_label_disabling_check(entry, type, init); - memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE); - } + __jump_label_set_jump_code(entry, type, init, &code); /* * Make text_poke_bp() a default fallback poker. -- 2.17.1
| |