iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jump_label, x86: Improve error when we fail expected text

Browse Source 
There is only a single usage site left, remove the function and extend
the print to include more information, like the expected text and the
patch type.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210506194157.726939027@infradead.org
This commit is contained in:
Peter Zijlstra 2021-05-06 21:33:57 +02:00 committed by Ingo Molnar
parent e1aa35c4c4
commit f9510fa9ca
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/x86/kernel/jump_label.c
View File

@ -16,37 +16,32 @@
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/text-patching.h> #include <asm/text-patching.h>
static void bug_at(const void *ip, int line)
{
/*
* The location is not an op that we were expecting.
* Something went wrong. Crash the box, as something could be
* corrupting the kernel.
*/
pr_crit("jump_label: Fatal kernel bug, unexpected op at %pS [%p] (%5ph) %d\n", ip, ip, ip, line);
BUG();
}
static const void * static const void *
__jump_label_set_jump_code(struct jump_entry *entry, enum jump_label_type type) __jump_label_set_jump_code(struct jump_entry *entry, enum jump_label_type type)
{ {
const void *expect, *code; const void *expect, *code;
const void *addr, *dest; const void *addr, *dest;
int line;
addr = (void *)jump_entry_code(entry); addr = (void *)jump_entry_code(entry);
dest = (void *)jump_entry_target(entry); dest = (void *)jump_entry_target(entry);
code = text_gen_insn(JMP32_INSN_OPCODE, addr, dest); code = text_gen_insn(JMP32_INSN_OPCODE, addr, dest);
if (type == JUMP_LABEL_JMP) { if (type == JUMP_LABEL_JMP)
expect = x86_nops[5]; line = __LINE__; expect = x86_nops[5];
} else { else
expect = code; line = __LINE__; expect = code;
}
if (memcmp(addr, expect, JUMP_LABEL_NOP_SIZE)) if (memcmp(addr, expect, JUMP_LABEL_NOP_SIZE)) {
bug_at(addr, line); /*
* The location is not an op that we were expecting.
* Something went wrong. Crash the box, as something could be
* corrupting the kernel.
*/
pr_crit("jump_label: Fatal kernel bug, unexpected op at %pS [%p] (%5ph != %5ph)) type:%d\n",
addr, addr, addr, expect, type);
BUG();
}
if (type == JUMP_LABEL_NOP) if (type == JUMP_LABEL_NOP)
code = x86_nops[5]; code = x86_nops[5];