Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752621AbbGIMC4 (ORCPT ); Thu, 9 Jul 2015 08:02:56 -0400 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.229]:20948 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751404AbbGIMCr (ORCPT ); Thu, 9 Jul 2015 08:02:47 -0400 Date: Thu, 9 Jul 2015 08:03:11 -0400 From: Steven Rostedt To: Masami Hiramatsu Cc: Vince Weaver , linux-api@vger.kernel.org, Heiko Carstens , Shuah Khan , Linux Kernel Mailing List , Ingo Molnar , Namhyung Kim , Ingo Molnar Subject: Re: [PATCH tip/master ] ftracetest: Update kprobe-tracer testcases because of renaming do_fork Message-ID: <20150709080311.37ae53c3@grimm.local.home> In-Reply-To: <20150709101012.21228.45338.stgit@localhost.localdomain> References: <20150709101012.21228.45338.stgit@localhost.localdomain> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-RR-Connecting-IP: 107.14.168.142:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4285 Lines: 119 On Thu, 09 Jul 2015 19:10:12 +0900 Masami Hiramatsu wrote: > echo 0 > events/enable > echo > kprobe_events > -echo p:myevent do_fork > kprobe_events > +echo p:myevent _do_fork > kprobe_events > grep myevent kprobe_events > test -d events/kprobes/myevent > echo > kprobe_events > diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc b/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc > index d8c7bb6..74507db 100644 > --- a/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc > @@ -5,7 +5,7 @@ > > echo 0 > events/enable > echo > kprobe_events > -echo p:myevent do_fork > kprobe_events > +echo p:myevent _do_fork > kprobe_events > test -d events/kprobes/myevent > echo 1 > events/kprobes/myevent/enable > echo > kprobe_events && exit 1 # this must fail > diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc > index c45ee27..64949d4 100644 > --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc > @@ -5,7 +5,7 @@ > > echo 0 > events/enable > echo > kprobe_events > -echo 'p:testprobe do_fork $stack $stack0 +0($stack)' > kprobe_events > +echo 'p:testprobe _do_fork $stack $stack0 +0($stack)' > kprobe_events > grep testprobe kprobe_events > test -d events/kprobes/testprobe > echo 1 > events/kprobes/testprobe/enable > diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc > index ab41d2b..d6f2f49 100644 > --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc > @@ -6,31 +6,31 @@ grep function available_tracers || exit_unsupported # this is configurable > > # prepare > echo nop > current_tracer > -echo do_fork > set_ftrace_filter > +echo _do_fork > set_ftrace_filter > echo 0 > events/enable > echo > kprobe_events > -echo 'p:testprobe do_fork' > kprobe_events > +echo 'p:testprobe _do_fork' > kprobe_events > > # kprobe on / ftrace off > echo 1 > events/kprobes/testprobe/enable > echo > trace > ( echo "forked") > grep testprobe trace > -! grep 'do_fork <-' trace > +! grep '_do_fork <-' trace > > # kprobe on / ftrace on > echo function > current_tracer > echo > trace > ( echo "forked") > grep testprobe trace > -grep 'do_fork <-' trace > +grep '_do_fork <-' trace > > # kprobe off / ftrace on > echo 0 > events/kprobes/testprobe/enable > echo > trace > ( echo "forked") > ! grep testprobe trace > -grep 'do_fork <-' trace > +grep '_do_fork <-' trace > > # kprobe on / ftrace on > echo 1 > events/kprobes/testprobe/enable > @@ -38,14 +38,14 @@ echo function > current_tracer > echo > trace > ( echo "forked") > grep testprobe trace > -grep 'do_fork <-' trace > +grep '_do_fork <-' trace > > # kprobe on / ftrace off > echo nop > current_tracer > echo > trace > ( echo "forked") > grep testprobe trace > -! grep 'do_fork <-' trace > +! grep '_do_fork <-' trace > > # cleanup > echo nop > current_tracer > diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc > index 3171798..0d09546 100644 > --- a/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc > @@ -5,7 +5,7 @@ > > echo 0 > events/enable > echo > kprobe_events > -echo 'r:testprobe2 do_fork $retval' > kprobe_events > +echo 'r:testprobe2 _do_fork $retval' > kprobe_events > grep testprobe2 kprobe_events > test -d events/kprobes/testprobe2 > echo 1 > events/kprobes/testprobe2/enable Instead of hard coding the name, what about adding a global variable for the function, in case we need to change it again, it would only need to be changed in one place? -- Steve -- 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/