Commit 544f1d62 authored by Ilya Leoshkevich's avatar Ilya Leoshkevich Committed by Vasily Gorbik

s390/disassembler: don't hide instruction addresses

Due to kptr_restrict, JITted BPF code is now displayed like this:

000000000b6ed1b2: ebdff0800024  stmg    %r13,%r15,128(%r15)
000000004cde2ba0: 41d0f040      la      %r13,64(%r15)
00000000fbad41b0: a7fbffa0      aghi    %r15,-96

Leaking kernel addresses to dmesg is not a concern in this case, because
this happens only when JIT debugging is explicitly activated, which only
root can do.

Use %px in this particular instance, and also to print an instruction
address in show_code and PCREL (e.g. brasl) arguments in print_insn.
While at present functionally equivalent to %016lx, %px is recommended
by Documentation/core-api/printk-formats.rst for such cases.
Signed-off-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 72fbcd05
...@@ -461,10 +461,11 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr) ...@@ -461,10 +461,11 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
ptr += sprintf(ptr, "%%c%i", value); ptr += sprintf(ptr, "%%c%i", value);
else if (operand->flags & OPERAND_VR) else if (operand->flags & OPERAND_VR)
ptr += sprintf(ptr, "%%v%i", value); ptr += sprintf(ptr, "%%v%i", value);
else if (operand->flags & OPERAND_PCREL) else if (operand->flags & OPERAND_PCREL) {
ptr += sprintf(ptr, "%lx", (signed int) value void *pcrel = (void *)((int)value + addr);
+ addr);
else if (operand->flags & OPERAND_SIGNED) ptr += sprintf(ptr, "%px", pcrel);
} else if (operand->flags & OPERAND_SIGNED)
ptr += sprintf(ptr, "%i", value); ptr += sprintf(ptr, "%i", value);
else else
ptr += sprintf(ptr, "%u", value); ptr += sprintf(ptr, "%u", value);
...@@ -536,7 +537,7 @@ void show_code(struct pt_regs *regs) ...@@ -536,7 +537,7 @@ void show_code(struct pt_regs *regs)
else else
*ptr++ = ' '; *ptr++ = ' ';
addr = regs->psw.addr + start - 32; addr = regs->psw.addr + start - 32;
ptr += sprintf(ptr, "%016lx: ", addr); ptr += sprintf(ptr, "%px: ", (void *)addr);
if (start + opsize >= end) if (start + opsize >= end)
break; break;
for (i = 0; i < opsize; i++) for (i = 0; i < opsize; i++)
...@@ -564,7 +565,7 @@ void print_fn_code(unsigned char *code, unsigned long len) ...@@ -564,7 +565,7 @@ void print_fn_code(unsigned char *code, unsigned long len)
opsize = insn_length(*code); opsize = insn_length(*code);
if (opsize > len) if (opsize > len)
break; break;
ptr += sprintf(ptr, "%p: ", code); ptr += sprintf(ptr, "%px: ", code);
for (i = 0; i < opsize; i++) for (i = 0; i < opsize; i++)
ptr += sprintf(ptr, "%02x", code[i]); ptr += sprintf(ptr, "%02x", code[i]);
*ptr++ = '\t'; *ptr++ = '\t';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment