From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755659AbcHXNFJ (ORCPT ); Wed, 24 Aug 2016 09:05:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48752 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754853AbcHXNFH (ORCPT ); Wed, 24 Aug 2016 09:05:07 -0400 Date: Wed, 24 Aug 2016 06:03:55 -0700 From: tip-bot for Josh Poimboeuf Message-ID: Cc: jpoimboe@redhat.com, keescook@chromium.org, hpa@zytor.com, rostedt@goodmis.org, mingo@kernel.org, tglx@linutronix.de, luto@kernel.org, bp@alien8.de, fweisbec@gmail.com, brgerst@gmail.com, dvlasenk@redhat.com, luto@amacapital.net, torvalds@linux-foundation.org, peterz@infradead.org, byungchul.park@lge.com, linux-kernel@vger.kernel.org, nilayvaish@gmail.com Reply-To: rostedt@goodmis.org, hpa@zytor.com, mingo@kernel.org, jpoimboe@redhat.com, keescook@chromium.org, brgerst@gmail.com, fweisbec@gmail.com, luto@kernel.org, bp@alien8.de, tglx@linutronix.de, torvalds@linux-foundation.org, peterz@infradead.org, luto@amacapital.net, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, nilayvaish@gmail.com, byungchul.park@lge.com In-Reply-To: <5c7747d9ea7b5cb47ef0a8ce8a6cea6bf7aa94bf.1471607358.git.jpoimboe@redhat.com> References: <5c7747d9ea7b5cb47ef0a8ce8a6cea6bf7aa94bf.1471607358.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] ftrace: Only allocate the ret_stack 'fp' field when needed Git-Commit-ID: daa460a88c09b26b68e8b017de589c217e901afb 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: daa460a88c09b26b68e8b017de589c217e901afb Gitweb: http://git.kernel.org/tip/daa460a88c09b26b68e8b017de589c217e901afb Author: Josh Poimboeuf AuthorDate: Fri, 19 Aug 2016 06:52:56 -0500 Committer: Ingo Molnar CommitDate: Wed, 24 Aug 2016 12:15:14 +0200 ftrace: Only allocate the ret_stack 'fp' field when needed This saves some memory when HAVE_FUNCTION_GRAPH_FP_TEST isn't defined. On x86_64 with newer versions of gcc which have -mfentry, it saves 400 bytes per task. Signed-off-by: Josh Poimboeuf Acked-by: Steven Rostedt Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Byungchul Park Cc: Denys Vlasenko Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Nilay Vaish Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/5c7747d9ea7b5cb47ef0a8ce8a6cea6bf7aa94bf.1471607358.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- include/linux/ftrace.h | 2 ++ kernel/trace/trace_functions_graph.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 7d565af..4ad9ccc 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -795,7 +795,9 @@ struct ftrace_ret_stack { unsigned long func; unsigned long long calltime; unsigned long long subtime; +#ifdef HAVE_FUNCTION_GRAPH_FP_TEST unsigned long fp; +#endif }; /* diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index fc173cd..0e03ed0 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -171,7 +171,9 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth, current->ret_stack[index].func = func; current->ret_stack[index].calltime = calltime; current->ret_stack[index].subtime = 0; +#ifdef HAVE_FUNCTION_GRAPH_FP_TEST current->ret_stack[index].fp = frame_pointer; +#endif *depth = current->curr_ret_stack; return 0;