From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966126AbcIHJuB (ORCPT ); Thu, 8 Sep 2016 05:50:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39868 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965632AbcIHJt6 (ORCPT ); Thu, 8 Sep 2016 05:49:58 -0400 Date: Thu, 8 Sep 2016 02:49:11 -0700 From: tip-bot for Josh Poimboeuf Message-ID: Cc: keescook@chromium.org, rostedt@goodmis.org, jpoimboe@redhat.com, peterz@infradead.org, tglx@linutronix.de, hpa@zytor.com, brgerst@gmail.com, mingo@kernel.org, torvalds@linux-foundation.org, luto@amacapital.net, nilayvaish@gmail.com, fweisbec@gmail.com, byungchul.park@lge.com, linux-kernel@vger.kernel.org Reply-To: torvalds@linux-foundation.org, luto@amacapital.net, nilayvaish@gmail.com, linux-kernel@vger.kernel.org, fweisbec@gmail.com, byungchul.park@lge.com, rostedt@goodmis.org, keescook@chromium.org, tglx@linutronix.de, jpoimboe@redhat.com, peterz@infradead.org, brgerst@gmail.com, hpa@zytor.com, mingo@kernel.org In-Reply-To: <9fbe0db05bacf66d337c162edbf61450d0cff1e2.1472057064.git.jpoimboe@redhat.com> References: <9fbe0db05bacf66d337c162edbf61450d0cff1e2.1472057064.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/dumpstack: Make printk_stack_address() more generally useful Git-Commit-ID: d438f5fda30ec087512355e405e9c8955d8bd337 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: d438f5fda30ec087512355e405e9c8955d8bd337 Gitweb: http://git.kernel.org/tip/d438f5fda30ec087512355e405e9c8955d8bd337 Author: Josh Poimboeuf AuthorDate: Wed, 24 Aug 2016 11:50:16 -0500 Committer: Ingo Molnar CommitDate: Thu, 8 Sep 2016 08:58:40 +0200 x86/dumpstack: Make printk_stack_address() more generally useful Change printk_stack_address() to be useful when called by an unwinder outside the context of dump_trace(). Specifically: - printk_stack_address()'s 'data' argument is always used as the log level string. Make that explicit. - Call touch_nmi_watchdog(). Signed-off-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Brian Gerst Cc: Byungchul Park Cc: Frederic Weisbecker Cc: Kees Cook Cc: Linus Torvalds Cc: Nilay Vaish Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/9fbe0db05bacf66d337c162edbf61450d0cff1e2.1472057064.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/dumpstack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 01072e9..f0ddf85 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -26,10 +26,11 @@ int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE; static int die_counter; static void printk_stack_address(unsigned long address, int reliable, - void *data) + char *log_lvl) { + touch_nmi_watchdog(); printk("%s [<%p>] %s%pB\n", - (char *)data, (void *)address, reliable ? "" : "? ", + log_lvl, (void *)address, reliable ? "" : "? ", (void *)address); } @@ -148,7 +149,6 @@ static int print_trace_stack(void *data, char *name) */ static int print_trace_address(void *data, unsigned long addr, int reliable) { - touch_nmi_watchdog(); printk_stack_address(addr, reliable, data); return 0; }