From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Jason Baron <jbaron@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: [PATCH 3/5 v2] x86/jump-label: Add safety checks to jump label conversions
Date: Sat, 28 Jan 2012 11:09:28 -0500 [thread overview]
Message-ID: <20120128161627.211742344@goodmis.org> (raw)
In-Reply-To: 20120128160925.275163704@goodmis.org
[-- Attachment #1: Type: text/plain, Size: 2709 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
As with all modifying of kernel text, we need to be very paranoid.
When converting the jump label locations to and from nops to jumps
a check has been added to make sure what we are replacing is what we
expect, otherwise we bug.
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jason Baron <jbaron@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/x86/kernel/jump_label.c | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index cd42721..12a8812 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -26,16 +26,40 @@ union jump_code_union {
static void __jump_label_transform(struct jump_entry *entry,
enum jump_label_type type,
- void *(*poker)(void *, const void *, size_t))
+ void *(*poker)(void *, const void *, size_t),
+ int init)
{
union jump_code_union code;
+ const unsigned char *ideal_nop = ideal_nops[NOP_ATOMIC5];
if (type == JUMP_LABEL_ENABLE) {
+ /*
+ * We are enabling this jump label. If it is not a nop
+ * then something must have gone wrong.
+ */
+ BUG_ON(memcmp((void *)entry->code, ideal_nop, 5) != 0);
+
code.jump = 0xe9;
code.offset = entry->target -
(entry->code + JUMP_LABEL_NOP_SIZE);
- } else
+ } else {
+ /*
+ * We are disabling this jump label. If it is not what
+ * we think it is, then something must have gone wrong.
+ * If this is the first initialization call, then we
+ * are converting the default nop to the ideal nop.
+ */
+ if (init) {
+ const unsigned char default_nop[] = { JUMP_LABEL_INIT_NOP };
+ BUG_ON(memcmp((void *)entry->code, default_nop, 5) != 0);
+ } else {
+ code.jump = 0xe9;
+ code.offset = entry->target -
+ (entry->code + JUMP_LABEL_NOP_SIZE);
+ BUG_ON(memcmp((void *)entry->code, &code, 5) != 0);
+ }
memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
+ }
(*poker)((void *)entry->code, &code, JUMP_LABEL_NOP_SIZE);
}
@@ -45,7 +69,7 @@ void arch_jump_label_transform(struct jump_entry *entry,
{
get_online_cpus();
mutex_lock(&text_mutex);
- __jump_label_transform(entry, type, text_poke_smp);
+ __jump_label_transform(entry, type, text_poke_smp, 0);
mutex_unlock(&text_mutex);
put_online_cpus();
}
@@ -71,7 +95,7 @@ void arch_jump_label_transform_static(struct jump_entry *entry,
update = 1;
}
if (update)
- __jump_label_transform(entry, type, text_poke_early);
+ __jump_label_transform(entry, type, text_poke_early, 1);
}
#endif
--
1.7.8.3
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-01-28 16:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-28 16:09 [PATCH 0/5 v2] [GIT PULL] x86/jump label: Paranoid checks and 2 or 5 byte nops Steven Rostedt
2012-01-28 16:09 ` [PATCH 1/5 v2] x86/jump-label: Use best default nops for inital jump label calls Steven Rostedt
2012-01-28 16:09 ` [PATCH 2/5 v2] x86/jump-label: Do not bother updating nops if they are correct Steven Rostedt
2012-01-28 16:09 ` Steven Rostedt [this message]
2012-01-28 16:09 ` [PATCH 4/5 v2] jump labels: Add infrastructure to update jump labels at compile time Steven Rostedt
2012-01-28 16:09 ` [PATCH 5/5 v2] x86/jump labels: Use etiher 5 byte or 2 byte jumps Steven Rostedt
2012-01-30 14:48 ` [PATCH 0/5 v2] [GIT PULL] x86/jump label: Paranoid checks and 2 or 5 byte nops Ingo Molnar
2012-01-30 15:07 ` Steven Rostedt
2012-01-31 19:48 ` Ingo Molnar
2012-02-01 5:08 ` Steven Rostedt
2012-02-01 8:05 ` Ingo Molnar
2012-02-01 13:20 ` Steven Rostedt
2012-02-01 15:21 ` Steven Rostedt
2012-02-02 13:51 ` Ingo Molnar
2012-02-02 14:10 ` H. Peter Anvin
2012-02-02 14:31 ` Steven Rostedt
2012-02-02 22:04 ` Steven Rostedt
2012-02-02 22:07 ` H. Peter Anvin
2012-02-02 22:53 ` Steven Rostedt
2012-02-03 7:36 ` Ingo Molnar
2012-02-03 13:31 ` Steven Rostedt
2012-02-05 11:47 ` Ingo Molnar
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=20120128161627.211742344@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jbaron@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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).