From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751556AbeACQ3C (ORCPT + 1 other); Wed, 3 Jan 2018 11:29:02 -0500 Received: from terminus.zytor.com ([65.50.211.136]:38619 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751209AbeACQ2p (ORCPT ); Wed, 3 Jan 2018 11:28:45 -0500 Date: Wed, 3 Jan 2018 08:23:04 -0800 From: tip-bot for Josh Poimboeuf Message-ID: Cc: alexander@tsoy.me, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, toralf.foerster@gmx.de, peterz@infradead.org, luto@amacapital.net, torvalds@linux-foundation.org, luto@kernel.org, jpoimboe@redhat.com, hpa@zytor.com Reply-To: tglx@linutronix.de, toralf.foerster@gmx.de, linux-kernel@vger.kernel.org, mingo@kernel.org, alexander@tsoy.me, luto@amacapital.net, peterz@infradead.org, luto@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, jpoimboe@redhat.com In-Reply-To: <396f84491d2f0ef64eda4217a2165f5712f6a115.1514736742.git.jpoimboe@redhat.com> References: <396f84491d2f0ef64eda4217a2165f5712f6a115.1514736742.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/dumpstack: Print registers for first stack frame Git-Commit-ID: 3ffdeb1a02be3086f1411a15c5b9c481fa28e21f 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 Return-Path: Commit-ID: 3ffdeb1a02be3086f1411a15c5b9c481fa28e21f Gitweb: https://git.kernel.org/tip/3ffdeb1a02be3086f1411a15c5b9c481fa28e21f Author: Josh Poimboeuf AuthorDate: Sun, 31 Dec 2017 10:18:07 -0600 Committer: Ingo Molnar CommitDate: Wed, 3 Jan 2018 16:14:46 +0100 x86/dumpstack: Print registers for first stack frame In the stack dump code, if the frame after the starting pt_regs is also a regs frame, the registers don't get printed. Fix that. Reported-by: Andy Lutomirski Tested-by: Alexander Tsoy Signed-off-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Toralf Förster Cc: stable@vger.kernel.org Fixes: 3b3fa11bc700 ("x86/dumpstack: Print any pt_regs found on the stack") Link: http://lkml.kernel.org/r/396f84491d2f0ef64eda4217a2165f5712f6a115.1514736742.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/dumpstack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index d0bb176..afbecff 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -115,6 +115,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, unwind_start(&state, task, regs, stack); stack = stack ? : get_stack_pointer(task, regs); + regs = unwind_get_entry_regs(&state, &partial); /* * Iterate through the stacks, starting with the current stack pointer. @@ -132,7 +133,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, * - hardirq stack * - entry stack */ - for (regs = NULL; stack; stack = PTR_ALIGN(stack_info.next_sp, sizeof(long))) { + for ( ; stack; stack = PTR_ALIGN(stack_info.next_sp, sizeof(long))) { const char *stack_name; if (get_stack_info(stack, task, &stack_info, &visit_mask)) {