From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760922AbdDSINl (ORCPT ); Wed, 19 Apr 2017 04:13:41 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52425 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760884AbdDSINW (ORCPT ); Wed, 19 Apr 2017 04:13:22 -0400 Date: Wed, 19 Apr 2017 01:07:35 -0700 From: tip-bot for Josh Poimboeuf Message-ID: Cc: tglx@linutronix.de, torvalds@linux-foundation.org, dvlasenk@redhat.com, brgerst@gmail.com, jpoimboe@redhat.com, bp@alien8.de, peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, luto@kernel.org, hpa@zytor.com Reply-To: hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, luto@kernel.org, peterz@infradead.org, jpoimboe@redhat.com, bp@alien8.de, dvlasenk@redhat.com, torvalds@linux-foundation.org, brgerst@gmail.com, tglx@linutronix.de In-Reply-To: <36b743812e7eb291d74af4e5067736736622daad.1492520933.git.jpoimboe@redhat.com> References: <36b743812e7eb291d74af4e5067736736622daad.1492520933.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/unwind: Properly zero-pad 32-bit values in unwind_dump() Git-Commit-ID: 9b135b234644c9881eee4f5d5683da0f4524722f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9b135b234644c9881eee4f5d5683da0f4524722f Gitweb: http://git.kernel.org/tip/9b135b234644c9881eee4f5d5683da0f4524722f Author: Josh Poimboeuf AuthorDate: Tue, 18 Apr 2017 08:12:56 -0500 Committer: Ingo Molnar CommitDate: Wed, 19 Apr 2017 09:59:47 +0200 x86/unwind: Properly zero-pad 32-bit values in unwind_dump() On x86-32, 32-bit stack values printed by unwind_dump() are confusingly zero-padded to 16 characters (64 bits): unwind stack type:0 next_sp: (null) mask:a graph_idx:0 f50cdebc: 00000000f50cdec4 (0xf50cdec4) f50cdec0: 00000000c40489b7 (irq_exit+0x87/0xa0) ... Instead, base the field width on the size of a long integer so that it looks right on both x86-32 and x86-64. x86-32: unwind stack type:1 next_sp: (null) mask:0x2 graph_idx:0 c0ee9d98: c0ee9de0 (init_thread_union+0x1de0/0x2000) c0ee9d9c: c043fd90 (__save_stack_trace+0x50/0xe0) ... x86-64: unwind stack type:1 next_sp: (null) mask:0x2 graph_idx:0 ffffffff81e03b88: ffffffff81e03c10 (init_thread_union+0x3c10/0x4000) ffffffff81e03b90: ffffffff81048f8e (__save_stack_trace+0x5e/0x100) ... Reported-by: H. Peter Anvin Signed-off-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/36b743812e7eb291d74af4e5067736736622daad.1492520933.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/unwind_frame.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/unwind_frame.c b/arch/x86/kernel/unwind_frame.c index c461135..3ebe687 100644 --- a/arch/x86/kernel/unwind_frame.c +++ b/arch/x86/kernel/unwind_frame.c @@ -48,11 +48,13 @@ static void unwind_dump(struct unwind_state *state, unsigned long *sp) if (zero) { if (!prev_zero) - printk_deferred("%p: %016x ...\n", sp, 0); + printk_deferred("%p: %0*x ...\n", + sp, BITS_PER_LONG/4, 0); continue; } - printk_deferred("%p: %016lx (%pB)\n", sp, word, (void *)word); + printk_deferred("%p: %0*lx (%pB)\n", + sp, BITS_PER_LONG/4, word, (void *)word); } }