From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226lluoq8aYmZedIkVXcsOsar7cQQJHjuG01+ZbLAe1OEIMXWLKMA3zCaMXcNTywtiDkgT3z ARC-Seal: i=1; a=rsa-sha256; t=1516968715; cv=none; d=google.com; s=arc-20160816; b=kiAOoj86wPNYNXe1rjbfPS3GV7VX0+cNcm6c4nCuAgpwj1OVYlNz1Ce3jGWyl7lvOW zSCEgtKpuM6Vl0v7jPN8N0LepLC4ab3RyJW530XnPYhRvMYpf6iEp4dGyB7y2DvdDtzE d7gmuI17C/Dr9pYekoRtXjWaeCiG5vbXy8Z0Vg0Te1RrkjlDfRoEIHCFQD3ZX6YW768/ mtmptsNrTsNFgsfLjZIStqUjM0QDMriYfDaCHxjQKOZ+cnVV9WIWmluRzFIKOTMgBnvr 6T8Zn2RT6ATFRochBpoaWao5yxqGG/XmcuuMmpAO/5RL9eEdmR5QQSP0CuJjF7N8COg0 I8aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=xtrXze7R6o7dv8ZbKUimxdeIIA725BgTZ7wbXWFbNJM=; b=tEauzZqLFhzCAqrWU0Sx+1gCGe5lKiUCNNTPZReR9VfYo/dqUm3xxBmky7oJIhHn/p kQyi54bw72EqwO3/bk908rpHREDiLVQHyl+WcoLwhCf3ttcCE2pE9JRdm5S9H54e2lLM g1AJQSPjjS4E071mGNeBG+6j0ii0WSPqDhG9AAHMcbLg3hMkaVuegjo5lngIfqksNuZG ovZgD7BNHwctN/A+tXAxgMMRNhwm08KhqahPb73lK9AFlL1jwypAcnHx76FhvCAfWnt3 tATaLRUJTOIHl4qFQyP/MLoOBjssiT4b0B6c0iVm5+vDFvmYf3dFDE/TYjySAi0S4qsT UIVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of bp@alien8.de designates 2a01:4f8:190:11c2::b:1457 as permitted sender) smtp.mailfrom=bp@alien8.de Authentication-Results: mx.google.com; spf=pass (google.com: domain of bp@alien8.de designates 2a01:4f8:190:11c2::b:1457 as permitted sender) smtp.mailfrom=bp@alien8.de From: Borislav Petkov To: X86 ML Cc: LKML , David Woodhouse , Josh Poimboeuf , tim.c.chen@linux.intel.com, pjt@google.com, jikos@kernel.org, gregkh@linux-foundation.org, dave.hansen@intel.com, riel@redhat.com, luto@amacapital.net, torvalds@linux-foundation.org, ak@linux.intel.com, keescook@google.com, peterz@infradead.org Subject: [PATCH 1/4] x86/alternative: Print unadorned pointers Date: Fri, 26 Jan 2018 13:11:36 +0100 Message-Id: <20180126121139.31959-2-bp@alien8.de> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20180126121139.31959-1-bp@alien8.de> References: <20180126121139.31959-1-bp@alien8.de> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590656987580483622?= X-GMAIL-MSGID: =?utf-8?q?1590656987580483622?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Borislav Petkov After commit ad67b74d2469 ("printk: hash addresses printed with %p") pointers are being hashed when printed. However, this makes the alternative debug output completely useless. Switch to %px in order to see the unadorned kernel pointers. Signed-off-by: Borislav Petkov --- arch/x86/kernel/alternative.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 4817d743c263..30571fdaaf6f 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -298,7 +298,7 @@ recompute_jump(struct alt_instr *a, u8 *orig_insn, u8 *repl_insn, u8 *insnbuf) tgt_rip = next_rip + o_dspl; n_dspl = tgt_rip - orig_insn; - DPRINTK("target RIP: %p, new_displ: 0x%x", tgt_rip, n_dspl); + DPRINTK("target RIP: %px, new_displ: 0x%x", tgt_rip, n_dspl); if (tgt_rip - orig_insn >= 0) { if (n_dspl - 2 <= 127) @@ -355,7 +355,7 @@ static void __init_or_module noinline optimize_nops(struct alt_instr *a, u8 *ins add_nops(instr + (a->instrlen - a->padlen), a->padlen); local_irq_restore(flags); - DUMP_BYTES(instr, a->instrlen, "%p: [%d:%d) optimized NOPs: ", + DUMP_BYTES(instr, a->instrlen, "%px: [%d:%d) optimized NOPs: ", instr, a->instrlen - a->padlen, a->padlen); } @@ -376,7 +376,7 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, u8 *instr, *replacement; u8 insnbuf[MAX_PATCH_LEN]; - DPRINTK("alt table %p -> %p", start, end); + DPRINTK("alt table %px, -> %px", start, end); /* * The scan order should be from start to end. A later scanned * alternative code can overwrite previously scanned alternative code. @@ -400,14 +400,14 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, continue; } - DPRINTK("feat: %d*32+%d, old: (%p, len: %d), repl: (%p, len: %d), pad: %d", + DPRINTK("feat: %d*32+%d, old: (%px len: %d), repl: (%px, len: %d), pad: %d", a->cpuid >> 5, a->cpuid & 0x1f, instr, a->instrlen, replacement, a->replacementlen, a->padlen); - DUMP_BYTES(instr, a->instrlen, "%p: old_insn: ", instr); - DUMP_BYTES(replacement, a->replacementlen, "%p: rpl_insn: ", replacement); + DUMP_BYTES(instr, a->instrlen, "%px: old_insn: ", instr); + DUMP_BYTES(replacement, a->replacementlen, "%px: rpl_insn: ", replacement); memcpy(insnbuf, replacement, a->replacementlen); insnbuf_sz = a->replacementlen; @@ -433,7 +433,7 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, a->instrlen - a->replacementlen); insnbuf_sz += a->instrlen - a->replacementlen; } - DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", instr); + DUMP_BYTES(insnbuf, insnbuf_sz, "%px: final_insn: ", instr); text_poke_early(instr, insnbuf, insnbuf_sz); } -- 2.13.0