hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 dump printing cleanup from Thomas Gleixner:
 "Clean up the show_opcodes() printout so nested dumps can be properly
  differentiated"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Avoid pr_cont() in show_opcodes()
This commit is contained in:
Linus Torvalds 2018-08-13 15:21:12 -07:00
parent 7796916146 8e974b3b8e
commit 27a5250197
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/x86/kernel/dumpstack.c
View File

@ -22,8 +22,6 @@
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
#include <asm/unwind.h> #include <asm/unwind.h>
#define OPCODE_BUFSIZE 64
int panic_on_unrecovered_nmi; int panic_on_unrecovered_nmi;
int panic_on_io_nmi; int panic_on_io_nmi;
static int die_counter; static int die_counter;
@ -93,26 +91,18 @@ static void printk_stack_address(unsigned long address, int reliable,
*/ */
void show_opcodes(u8 *rip, const char *loglvl) void show_opcodes(u8 *rip, const char *loglvl)
{ {
unsigned int code_prologue = OPCODE_BUFSIZE * 2 / 3; #define PROLOGUE_SIZE 42
#define EPILOGUE_SIZE 21
#define OPCODE_BUFSIZE (PROLOGUE_SIZE + 1 + EPILOGUE_SIZE)
u8 opcodes[OPCODE_BUFSIZE]; u8 opcodes[OPCODE_BUFSIZE];
u8 *ip;
int i;
printk("%sCode: ", loglvl); if (probe_kernel_read(opcodes, rip - PROLOGUE_SIZE, OPCODE_BUFSIZE)) {
printk("%sCode: Bad RIP value.\n", loglvl);
ip = (u8 *)rip - code_prologue; } else {
if (probe_kernel_read(opcodes, ip, OPCODE_BUFSIZE)) { printk("%sCode: %" __stringify(PROLOGUE_SIZE) "ph <%02x> %"
pr_cont("Bad RIP value.\n"); __stringify(EPILOGUE_SIZE) "ph\n", loglvl, opcodes,
return; opcodes[PROLOGUE_SIZE], opcodes + PROLOGUE_SIZE + 1);
} }
for (i = 0; i < OPCODE_BUFSIZE; i++, ip++) {
if (ip == rip)
pr_cont("<%02x> ", opcodes[i]);
else
pr_cont("%02x ", opcodes[i]);
}
pr_cont("\n");
} }
void show_ip(struct pt_regs *regs, const char *loglvl) void show_ip(struct pt_regs *regs, const char *loglvl)