Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755322AbbHDHpM (ORCPT ); Tue, 4 Aug 2015 03:45:12 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34819 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755220AbbHDHpF (ORCPT ); Tue, 4 Aug 2015 03:45:05 -0400 From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, rostedt@goodmis.org Cc: jungseoklee85@gmail.com, olof@lixom.net, broonie@kernel.org, david.griego@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [RFC v2 3/4] arm64: ftrace: fix a stack trace result under function graph tracer Date: Tue, 4 Aug 2015 16:44:08 +0900 Message-Id: <1438674249-3447-4-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438674249-3447-1-git-send-email-takahiro.akashi@linaro.org> References: <1438674249-3447-1-git-send-email-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1786 Lines: 53 Function graph tracer modifies a saved lr register on stack in order to hook a function return. This results in finding many bogus entries in a stack trace list. This patch replaces such entries with originals values stored in current->ret_stack[]. Signed-off-by: AKASHI Takahiro --- arch/arm64/kernel/stacktrace.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c index 496ab0f..d1790eb 100644 --- a/arch/arm64/kernel/stacktrace.c +++ b/arch/arm64/kernel/stacktrace.c @@ -100,6 +100,28 @@ static void notrace arm64_stack_index(struct stackframe *frame, /* should not go beyond this frame */ if (trace->index[x] == THREAD_SIZE) trace->index[x] = 0; + + if (trace->entries[x] == + ((unsigned long)return_to_handler + 0x8)) { + /* + * This is a case where return_to_handler() is calling + * ftrace_return_to_handler(). As we are already on + * an original function's stack, we have no way to fetch + * a correct pc value, just skip it. + */ + trace->entries[x] = 0x0; + } else if (trace->entries[x] == + (unsigned long)return_to_handler - AARCH64_INSN_SIZE) { + /* + * This is a case where function graph tracer has + * modified lr register on a stack to hook a function + * return. + * So replace it to original value. + */ + trace->entries[x] = + current->ret_stack[data->ret_stack_index--].ret + - AARCH64_INSN_SIZE; + } } #endif /* CONFIG_STACK_TRACER */ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/