lkml.org 
[lkml]   [2018]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH V3 4/9] x86/jump_label: Add __jump_label_set_jump_code() helper
Date
Move the definition of the code to be written from
__jump_label_transform() to a specialized function. No change in the
method, code relocation only.

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: Masami Hiramatsu <mhiramat@kernel.org>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
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 | 38 +++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index 7894080bd02f..a039ac4ca5bf 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -75,30 +75,36 @@ static inline void __jump_label_trans_check_disable(struct jump_entry *entry,
bug_at((void *)jump_entry_code(entry), line);
}

+static void __jump_label_set_jump_code(struct jump_entry *entry,
+ enum jump_label_type type,
+ union jump_code_union *code,
+ int init)
+{
+ const unsigned char *ideal_nop = ideal_nops[NOP_ATOMIC5];
+
+ code->jump = 0xe9;
+ code->offset = jump_entry_target(entry) -
+ (jump_entry_code(entry) + JUMP_LABEL_NOP_SIZE);
+
+ if (type == JUMP_LABEL_JMP) {
+ __jump_label_trans_check_enable(entry, type, ideal_nop, init);
+ } else {
+ __jump_label_trans_check_disable(entry, type, code, init);
+ memcpy(code, ideal_nop, 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),
int init)
{
- union jump_code_union jmp;
- const unsigned char *ideal_nop = ideal_nops[NOP_ATOMIC5];
- const void *code;
-
- jmp.jump = 0xe9;
- jmp.offset = jump_entry_target(entry) -
- (jump_entry_code(entry) + JUMP_LABEL_NOP_SIZE);
+ union jump_code_union code;

if (early_boot_irqs_disabled)
poker = text_poke_early;

- if (type == JUMP_LABEL_JMP) {
- __jump_label_trans_check_enable(entry, type, ideal_nop, init);
- code = &jmp.code;
- } else {
- __jump_label_trans_check_disable(entry, type, &jmp, init);
- code = ideal_nop;
- }
+ __jump_label_set_jump_code(entry, type, &code, init);

/*
* Make text_poke_bp() a default fallback poker.
@@ -109,12 +115,12 @@ static void __ref __jump_label_transform(struct jump_entry *entry,
*
*/
if (poker) {
- (*poker)((void *)jump_entry_code(entry), code,
+ (*poker)((void *)jump_entry_code(entry), &code,
JUMP_LABEL_NOP_SIZE);
return;
}

- text_poke_bp((void *)jump_entry_code(entry), code, JUMP_LABEL_NOP_SIZE,
+ text_poke_bp((void *)jump_entry_code(entry), &code, JUMP_LABEL_NOP_SIZE,
(void *)jump_entry_code(entry) + JUMP_LABEL_NOP_SIZE);
}

--
2.17.1
\
 
 \ /
  Last update: 2018-12-21 11:29    [W:0.155 / U:14.420 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site