From: Daniel Bristot de Oliveira <bristot@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
"Steven Rostedt (VMware)" <rostedt@goodmis.org>,
Jiri Kosina <jkosina@suse.cz>,
Josh Poimboeuf <jpoimboe@redhat.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Chris von Recklinghausen <crecklin@redhat.com>,
Jason Baron <jbaron@akamai.com>, Scott Wood <swood@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Clark Williams <williams@redhat.com>,
x86@kernel.org
Subject: [PATCH V5 3/7] x86/jump_label: Add a __jump_label_set_jump_code() helper
Date: Mon, 1 Apr 2019 10:58:15 +0200 [thread overview]
Message-ID: <ab1bfaf65feb3fd1f126e1d6c922cb9184214000.1554106794.git.bristot@redhat.com> (raw)
In-Reply-To: <cover.1554106794.git.bristot@redhat.com>
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: 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 | 47 ++++++++++++++++++++++--------------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index f99bd26bd3f1..8aa65fbbd764 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -35,24 +35,20 @@ static void bug_at(unsigned char *ip, int line)
BUG();
}
-static void __ref __jump_label_transform(struct jump_entry *entry,
- enum jump_label_type type,
- void *(*poker)(void *, const void *, size_t),
- int init)
+static void __jump_label_set_jump_code(struct jump_entry *entry,
+ enum jump_label_type type,
+ union jump_code_union *code,
+ int init)
{
- union jump_code_union jmp;
const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP };
const unsigned char *ideal_nop = ideal_nops[NOP_ATOMIC5];
- const void *expect, *code;
+ const void *expect;
int line;
- jmp.jump = 0xe9;
- jmp.offset = jump_entry_target(entry) -
+ code->jump = 0xe9;
+ code->offset = jump_entry_target(entry) -
(jump_entry_code(entry) + JUMP_LABEL_NOP_SIZE);
- if (early_boot_irqs_disabled)
- poker = text_poke_early;
-
if (type == JUMP_LABEL_JMP) {
if (init) {
expect = default_nop; line = __LINE__;
@@ -60,19 +56,34 @@ static void __ref __jump_label_transform(struct jump_entry *entry,
expect = ideal_nop; line = __LINE__;
}
- code = &jmp.code;
+ if (memcmp((void *)jump_entry_code(entry), expect, JUMP_LABEL_NOP_SIZE))
+ bug_at((void *)jump_entry_code(entry), line);
+
} else {
if (init) {
expect = default_nop; line = __LINE__;
} else {
- expect = &jmp.code; line = __LINE__;
+ expect = code->code; line = __LINE__;
}
- code = ideal_nop;
+ if (memcmp((void *)jump_entry_code(entry), expect, JUMP_LABEL_NOP_SIZE))
+ bug_at((void *)jump_entry_code(entry), line);
+
+ 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 code;
+
+ if (early_boot_irqs_disabled)
+ poker = text_poke_early;
- if (memcmp((void *)jump_entry_code(entry), expect, JUMP_LABEL_NOP_SIZE))
- bug_at((void *)jump_entry_code(entry), line);
+ __jump_label_set_jump_code(entry, type, &code, init);
/*
* Make text_poke_bp() a default fallback poker.
@@ -83,12 +94,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.20.1
next prev parent reply other threads:[~2019-04-01 8:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 8:58 [PATCH V5 0/7] x86/jump_label: Bound IPIs sent when updating a static key Daniel Bristot de Oliveira
2019-04-01 8:58 ` [PATCH V5 1/7] jump_label: Add for_each_label_entry helper Daniel Bristot de Oliveira
2019-04-15 10:51 ` Peter Zijlstra
2019-04-15 11:29 ` Daniel Bristot de Oliveira
2019-04-01 8:58 ` [PATCH V5 2/7] jump_label: Add a jump_label_can_update() helper Daniel Bristot de Oliveira
2019-04-01 8:58 ` Daniel Bristot de Oliveira [this message]
2019-04-01 8:58 ` [PATCH V5 4/7] jump_label: Sort entries of the same key by the code Daniel Bristot de Oliveira
2019-04-15 10:55 ` Peter Zijlstra
2019-04-15 11:33 ` Daniel Bristot de Oliveira
2019-04-01 8:58 ` [PATCH V5 5/7] x86/alternative: Batch of patch operations Daniel Bristot de Oliveira
2019-04-15 11:35 ` Peter Zijlstra
2019-04-01 8:58 ` [PATCH V5 6/7] jump_label: Batch updates if arch supports it Daniel Bristot de Oliveira
2019-04-15 11:50 ` Peter Zijlstra
2019-04-01 8:58 ` [PATCH V5 7/7] x86/jump_label: Batch jump label updates Daniel Bristot de Oliveira
2019-04-15 11:54 ` Peter Zijlstra
2019-04-15 12:15 ` Daniel Bristot de Oliveira
2019-05-02 20:18 ` Daniel Bristot de Oliveira
2019-04-15 9:52 ` [PATCH V5 0/7] x86/jump_label: Bound IPIs sent when updating a static key Daniel Bristot de Oliveira
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ab1bfaf65feb3fd1f126e1d6c922cb9184214000.1554106794.git.bristot@redhat.com \
--to=bristot@redhat.com \
--cc=bp@alien8.de \
--cc=crecklin@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jbaron@akamai.com \
--cc=jkosina@suse.cz \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=mtosatti@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=swood@redhat.com \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).