From: Borislav Petkov <bp@alien8.de>
To: X86 ML <x86@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 5/9] x86/dumpstack: Improve opcodes dumping in the Code: section
Date: Tue, 6 Mar 2018 10:49:16 +0100 [thread overview]
Message-ID: <20180306094920.16917-6-bp@alien8.de> (raw)
In-Reply-To: <20180306094920.16917-1-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
The code used to iterate byte-by-byte over the bytes around RIP and that
is expensive: disabling pagefaults around it, copy_from_user, etc...
Make it read the whole buffer of code_bytes size in one go. By default
use a statically allocated 64 bytes buffer. If "code_bytes=" is supplied
on the cmdline a new buffer gets allocated.
Also, do the PAGE_OFFSET check outside of the function because latter
will be reused in other context.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/kernel/dumpstack.c | 44 +++++++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 19a5860b62c8..12ddfc9dcb01 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -22,9 +22,13 @@
#include <asm/stacktrace.h>
#include <asm/unwind.h>
+#define OPCODE_BUFSIZE 64
+
int panic_on_unrecovered_nmi;
int panic_on_io_nmi;
-static unsigned int code_bytes = 64;
+static unsigned int code_bytes = OPCODE_BUFSIZE;
+static u8 __opc[OPCODE_BUFSIZE];
+static u8 *opcodes = __opc;
static int die_counter;
bool in_task_stack(unsigned long *stack, struct task_struct *task,
@@ -71,29 +75,23 @@ static void printk_stack_address(unsigned long address, int reliable,
static void show_opcodes(u8 *rip)
{
- unsigned int code_prologue = code_bytes * 43 / 64;
- unsigned int code_len = code_bytes;
- unsigned char c;
+ unsigned int code_prologue = code_bytes * 43 / OPCODE_BUFSIZE;
u8 *ip;
int i;
printk(KERN_DEFAULT "Code: ");
ip = (u8 *)rip - code_prologue;
- if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
- /* try starting at IP */
- ip = (u8 *)rip;
- code_len = code_len - code_prologue + 1;
+ if (probe_kernel_read(opcodes, ip, code_bytes)) {
+ pr_cont(" Bad RIP value.\n");
+ return;
}
- for (i = 0; i < code_len; i++, ip++) {
- if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
- pr_cont(" Bad RIP value.");
- break;
- }
+
+ for (i = 0; i < code_bytes; i++, ip++) {
if (ip == (u8 *)rip)
- pr_cont("<%02x> ", c);
+ pr_cont("<%02x> ", opcodes[i]);
else
- pr_cont("%02x ", c);
+ pr_cont("%02x ", opcodes[i]);
}
pr_cont("\n");
}
@@ -387,8 +385,8 @@ void die(const char *str, struct pt_regs *regs, long err)
static int __init code_bytes_setup(char *s)
{
- ssize_t ret;
unsigned long val;
+ ssize_t ret;
if (!s)
return -EINVAL;
@@ -401,6 +399,14 @@ static int __init code_bytes_setup(char *s)
if (code_bytes > 8192)
code_bytes = 8192;
+ if (code_bytes > OPCODE_BUFSIZE) {
+ u8 *new_buf = kzalloc(code_bytes, GFP_KERNEL);
+ if (!new_buf)
+ return -ENOMEM;
+
+ opcodes = new_buf;
+ }
+
return 1;
}
__setup("code_bytes=", code_bytes_setup);
@@ -422,6 +428,10 @@ void show_regs(struct pt_regs *regs)
*/
if (!user_mode(regs)) {
show_trace_log_lvl(current, regs, NULL, KERN_DEFAULT);
- show_opcodes((u8 *)regs->ip);
+
+ if (regs->ip < PAGE_OFFSET)
+ pr_cont(" Bad RIP value.\n");
+ else
+ show_opcodes((u8 *)regs->ip);
}
}
--
2.13.0
next prev parent reply other threads:[~2018-03-06 9:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-06 9:49 [PATCH 0/9] x86/dumpstack: Cleanups and user opcode bytes Code: section, v1 Borislav Petkov
2018-03-06 9:49 ` [PATCH 1/9] panic: Add closing panic marker parenthesis Borislav Petkov
2018-03-08 11:03 ` [tip:core/core] " tip-bot for Borislav Petkov
2018-03-06 9:49 ` [PATCH 2/9] x86/fault: Do not print IP in show_fault_oops() Borislav Petkov
2018-03-08 11:09 ` [tip:x86/cleanups] " tip-bot for Borislav Petkov
2018-03-06 9:49 ` [PATCH 3/9] x86/dumpstack: Unify show_regs() Borislav Petkov
2018-03-08 11:10 ` [tip:x86/cleanups] " tip-bot for Borislav Petkov
2018-03-06 9:49 ` [PATCH 4/9] x86/dumpstack: Carve out Code: dumping into a function Borislav Petkov
2018-03-06 9:49 ` Borislav Petkov [this message]
2018-03-06 18:47 ` [PATCH 5/9] x86/dumpstack: Improve opcodes dumping in the Code: section Linus Torvalds
2018-03-07 10:13 ` Borislav Petkov
2018-03-07 13:25 ` Josh Poimboeuf
2018-03-07 14:16 ` Borislav Petkov
2018-03-07 21:08 ` Linus Torvalds
2018-03-08 10:16 ` Borislav Petkov
2018-03-08 18:00 ` Linus Torvalds
2018-03-08 22:36 ` Borislav Petkov
2018-03-08 23:20 ` Linus Torvalds
2018-03-09 10:15 ` Borislav Petkov
2018-03-06 9:49 ` [PATCH 6/9] x86/dumpstack: Add loglevel argument to show_opcodes() Borislav Petkov
2018-03-06 9:49 ` [PATCH 7/9] x86/fault: Dump user opcode bytes on fatal faults Borislav Petkov
2018-03-06 9:49 ` [PATCH 8/9] x86/dumpstack: Add a show_ip() function Borislav Petkov
2018-03-06 9:49 ` [PATCH 9/9] x86/dumpstack: Save first regs set for the executive summary Borislav Petkov
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=20180306094920.16917-6-bp@alien8.de \
--to=bp@alien8.de \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=peterz@infradead.org \
--cc=torvalds@linux-foundation.org \
--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).