From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753010AbcHLOkl (ORCPT ); Fri, 12 Aug 2016 10:40:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59350 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752805AbcHLOcF (ORCPT ); Fri, 12 Aug 2016 10:32:05 -0400 From: Josh Poimboeuf To: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Andy Lutomirski , Linus Torvalds , Steven Rostedt , Brian Gerst , Kees Cook , Peter Zijlstra , Frederic Weisbecker , Byungchul Park , Nilay Vaish , Robert Richter Subject: [PATCH v3 21/51] oprofile/x86: add regs->ip to oprofile trace Date: Fri, 12 Aug 2016 09:28:40 -0500 Message-Id: <7f20c5ecd42fc917dce6d1118e7259a1c5762926.1471011425.git.jpoimboe@redhat.com> In-Reply-To: References: X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 12 Aug 2016 14:32:05 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dump_trace() doesn't add the interrupted instruction's address to the trace, so add it manually. Cc: Robert Richter Signed-off-by: Josh Poimboeuf --- arch/x86/oprofile/backtrace.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c index c594768..d950f9e 100644 --- a/arch/x86/oprofile/backtrace.c +++ b/arch/x86/oprofile/backtrace.c @@ -113,8 +113,14 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth) struct stack_frame *head = (struct stack_frame *)frame_pointer(regs); if (!user_mode(regs)) { - if (depth) - dump_trace(NULL, regs, NULL, 0, &backtrace_ops, &depth); + if (!depth) + return; + + oprofile_add_trace(regs->ip); + if (!--depth) + return; + + dump_trace(NULL, regs, NULL, 0, &backtrace_ops, &depth); return; } -- 2.7.4