From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751850AbbCZAp4 (ORCPT <rfc822;w@1wt.eu>);
	Wed, 25 Mar 2015 20:45:56 -0400
Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:42500 "EHLO
	lgemrelse7q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751278AbbCZApz (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 25 Mar 2015 20:45:55 -0400
X-Original-SENDERIP: 10.177.220.203
X-Original-MAILFROM: namhyung@kernel.org
From: Namhyung Kim <namhyung@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
        Tom Zanussi <tom.zanussi@linux.intel.com>,
        Minchan Kim <minchan@kernel.org>
Subject: [PATCH] tracing: Increase stack skip on event trigger
Date: Thu, 26 Mar 2015 09:39:23 +0900
Message-Id: <1427330363-17733-1-git-send-email-namhyung@kernel.org>
X-Mailer: git-send-email 2.3.3
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When 'stacktrace' trigger is used for event tracing, it should skip 4
functions instead of 3.  Otherwise it'll contain ftrace_raw_event_XXX
like below:

  # echo stacktrace > events/sched/sched_switch/trigger
  # tail trace
   => rcu_gp_kthread
   => kthread
   => ret_from_fork
       ksoftirqd/0-3     [000] d..3    53.343993: <stack trace>
   => ftrace_raw_event_sched_switch
   => __schedule
   => schedule
   => smpboot_thread_fn
   => kthread
   => ret_from_fork

Reported-by: Minchan Kim <minchan@kernel.org>
Cc: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 kernel/trace/trace_events_trigger.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 8712df9decb4..c58fbdd3053e 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -965,12 +965,13 @@ static __init int register_trigger_snapshot_cmd(void) { return 0; }
 
 #ifdef CONFIG_STACKTRACE
 /*
- * Skip 3:
+ * Skip 4:
  *   stacktrace_trigger()
  *   event_triggers_post_call()
+ *   ftrace_event_buffer_commit()
  *   ftrace_raw_event_xxx()
  */
-#define STACK_SKIP 3
+#define STACK_SKIP 4
 
 static void
 stacktrace_trigger(struct event_trigger_data *data)
-- 
2.3.3