From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751258AbdFDEEp (ORCPT ); Sun, 4 Jun 2017 00:04:45 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:35304 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751159AbdFDEEK (ORCPT ); Sun, 4 Jun 2017 00:04:10 -0400 From: Joel Fernandes To: linux-kernel@vger.kernel.org Cc: Joel Fernandes , kernel-team@android.com, Steven Rostedt , Ingo Molnar Subject: [RFC v2 4/4] tracing/ftrace: Add support to record and display tgid Date: Sat, 3 Jun 2017 21:03:50 -0700 Message-Id: <20170604040350.12641-5-joelaf@google.com> X-Mailer: git-send-email 2.13.0.506.g27d5fe0cd-goog In-Reply-To: <20170604040350.12641-1-joelaf@google.com> References: <20170604040350.12641-1-joelaf@google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make function tracer able to record tgid if/when record-tgid is enabled. Cc: kernel-team@android.com Cc: Steven Rostedt Cc: Ingo Molnar Signed-off-by: Joel Fernandes --- kernel/trace/trace_functions.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 05da1e7513f6..290a7a80abf2 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -27,6 +27,7 @@ static void function_stack_trace_call(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *op, struct pt_regs *pt_regs); static struct tracer_flags func_flags; +static bool tgid_recorded; /* Our option */ enum { @@ -103,7 +104,8 @@ static int function_trace_init(struct trace_array *tr) tr->trace_buffer.cpu = get_cpu(); put_cpu(); - tracing_start_taskinfo_record(true, false); + tgid_recorded = tr->trace_flags & TRACE_ITER_RECORD_TGID; + tracing_start_taskinfo_record(true, tgid_recorded); tracing_start_function_trace(tr); return 0; @@ -112,7 +114,8 @@ static int function_trace_init(struct trace_array *tr) static void function_trace_reset(struct trace_array *tr) { tracing_stop_function_trace(tr); - tracing_stop_taskinfo_record(true, false); + tracing_stop_taskinfo_record(true, tgid_recorded); + tgid_recorded = false; ftrace_reset_array_ops(tr); } @@ -253,6 +256,21 @@ func_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set) return 0; } +static int +func_tracer_flag_changed(struct trace_array *tr, unsigned int mask, + int enabled) +{ + if (mask == TRACE_ITER_RECORD_TGID) { + tgid_recorded = !!enabled; + if (enabled) + tracing_start_taskinfo_record(false, true); + else + tracing_stop_taskinfo_record(false, true); + } + + return 0; +} + static struct tracer function_trace __tracer_data = { .name = "function", @@ -261,6 +279,7 @@ static struct tracer function_trace __tracer_data = .start = function_trace_start, .flags = &func_flags, .set_flag = func_set_flag, + .flag_changed = func_tracer_flag_changed, .allow_instances = true, #ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_function, -- 2.13.0.506.g27d5fe0cd-goog