* [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point
@ 2016-05-10 14:53 Namhyung Kim
2016-05-10 14:53 ` [PATCH 2/2] kselftests/ftrace: Add a test case for event pid filtering Namhyung Kim
2016-05-10 15:24 ` [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point Shuah Khan
0 siblings, 2 replies; 6+ messages in thread
From: Namhyung Kim @ 2016-05-10 14:53 UTC (permalink / raw)
To: Steven Rostedt, Shuah Khan; +Cc: LKML, Masami Hiramatsu, linux-kselftest
Currently ftracetest assumes tracing directory is located under
$DEBUGFS/tracing. But it's possible to mount tracefs directly without
debugfs.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/testing/selftests/ftrace/ftracetest | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest
index da48812ab95e..4c6a0bf8ba79 100755
--- a/tools/testing/selftests/ftrace/ftracetest
+++ b/tools/testing/selftests/ftrace/ftracetest
@@ -88,7 +88,12 @@ parse_opts() { # opts
# Parameters
DEBUGFS_DIR=`grep debugfs /proc/mounts | cut -f2 -d' ' | head -1`
-TRACING_DIR=$DEBUGFS_DIR/tracing
+if [ -z "$DEBUGFS_DIR" ]; then
+ TRACING_DIR=`grep tracefs /proc/mounts | cut -f2 -d' ' | head -1`
+else
+ TRACING_DIR=$DEBUGFS_DIR/tracing
+fi
+
TOP_DIR=`absdir $0`
TEST_DIR=$TOP_DIR/test.d
TEST_CASES=`find_testcases $TEST_DIR`
@@ -102,7 +107,7 @@ parse_opts $*
[ $DEBUG -ne 0 ] && set -x
# Verify parameters
-if [ -z "$DEBUGFS_DIR" -o ! -d "$TRACING_DIR" ]; then
+if [ -z "$TRACING_DIR" -o ! -d "$TRACING_DIR" ]; then
errexit "No ftrace directory found"
fi
--
2.8.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] kselftests/ftrace: Add a test case for event pid filtering
2016-05-10 14:53 [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point Namhyung Kim
@ 2016-05-10 14:53 ` Namhyung Kim
2016-05-10 15:24 ` Shuah Khan
2016-05-10 15:24 ` [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point Shuah Khan
1 sibling, 1 reply; 6+ messages in thread
From: Namhyung Kim @ 2016-05-10 14:53 UTC (permalink / raw)
To: Steven Rostedt, Shuah Khan; +Cc: LKML, Masami Hiramatsu, linux-kselftest
Check event is filtered by set_event_pid and options/event-fork.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
.../selftests/ftrace/test.d/event/event-pid.tc | 72 ++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 tools/testing/selftests/ftrace/test.d/event/event-pid.tc
diff --git a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
new file mode 100644
index 000000000000..d4ab27b522f8
--- /dev/null
+++ b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
@@ -0,0 +1,72 @@
+#!/bin/sh
+# description: event tracing - restricts events based on pid
+
+do_reset() {
+ echo > set_event
+ echo > set_event_pid
+ echo 0 > options/event-fork
+ clear_trace
+}
+
+fail() { #msg
+ do_reset
+ echo $1
+ exit $FAIL
+}
+
+yield() {
+ ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+}
+
+if [ ! -f set_event -o ! -d events/sched ]; then
+ echo "event tracing is not supported"
+ exit_unsupported
+fi
+
+if [ ! -f set_event_pid ]; then
+ echo "event pid filtering is not supported"
+ exit_unsupported
+fi
+
+reset_tracer
+do_reset
+
+echo 1 > events/sched/sched_switch/enable
+
+yield
+
+count=`cat trace | grep sched_switch | wc -l`
+if [ $count -eq 0 ]; then
+ fail "sched_switch events are not recorded"
+fi
+
+do_reset
+
+read mypid rest < /proc/self/stat
+
+echo $mypid > set_event_pid
+echo 'sched:sched_switch' > set_event
+
+yield
+
+count=`cat trace | grep sched_switch | grep -v "pid=$mypid" | wc -l`
+if [ $count -ne 0 ]; then
+ fail "sched_switch events from other task are recorded"
+fi
+
+do_reset
+
+echo $mypid > set_event_pid
+echo 1 > options/event-fork
+echo 1 > events/sched/sched_switch/enable
+
+yield
+
+count=`cat trace | grep sched_switch | grep -v "pid=$mypid" | wc -l`
+if [ $count -eq 0 ]; then
+ fail "sched_switch events from other task are not recorded"
+fi
+
+do_reset
+
+exit 0
--
2.8.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] kselftests/ftrace: Add a test case for event pid filtering
2016-05-10 14:53 ` [PATCH 2/2] kselftests/ftrace: Add a test case for event pid filtering Namhyung Kim
@ 2016-05-10 15:24 ` Shuah Khan
2016-05-16 16:12 ` Shuah Khan
0 siblings, 1 reply; 6+ messages in thread
From: Shuah Khan @ 2016-05-10 15:24 UTC (permalink / raw)
To: Namhyung Kim, Steven Rostedt; +Cc: LKML, Masami Hiramatsu, linux-kselftest
On 05/10/2016 08:53 AM, Namhyung Kim wrote:
> Check event is filtered by set_event_pid and options/event-fork.
>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Looks good to me. Steve! Ack if you are good with this patch.
I can get this into 4.8-rc1
thanks,
-- Shuah
> ---
> .../selftests/ftrace/test.d/event/event-pid.tc | 72 ++++++++++++++++++++++
> 1 file changed, 72 insertions(+)
> create mode 100644 tools/testing/selftests/ftrace/test.d/event/event-pid.tc
>
> diff --git a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
> new file mode 100644
> index 000000000000..d4ab27b522f8
> --- /dev/null
> +++ b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
> @@ -0,0 +1,72 @@
> +#!/bin/sh
> +# description: event tracing - restricts events based on pid
> +
> +do_reset() {
> + echo > set_event
> + echo > set_event_pid
> + echo 0 > options/event-fork
> + clear_trace
> +}
> +
> +fail() { #msg
> + do_reset
> + echo $1
> + exit $FAIL
> +}
> +
> +yield() {
> + ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> +}
> +
> +if [ ! -f set_event -o ! -d events/sched ]; then
> + echo "event tracing is not supported"
> + exit_unsupported
> +fi
> +
> +if [ ! -f set_event_pid ]; then
> + echo "event pid filtering is not supported"
> + exit_unsupported
> +fi
> +
> +reset_tracer
> +do_reset
> +
> +echo 1 > events/sched/sched_switch/enable
> +
> +yield
> +
> +count=`cat trace | grep sched_switch | wc -l`
> +if [ $count -eq 0 ]; then
> + fail "sched_switch events are not recorded"
> +fi
> +
> +do_reset
> +
> +read mypid rest < /proc/self/stat
> +
> +echo $mypid > set_event_pid
> +echo 'sched:sched_switch' > set_event
> +
> +yield
> +
> +count=`cat trace | grep sched_switch | grep -v "pid=$mypid" | wc -l`
> +if [ $count -ne 0 ]; then
> + fail "sched_switch events from other task are recorded"
> +fi
> +
> +do_reset
> +
> +echo $mypid > set_event_pid
> +echo 1 > options/event-fork
> +echo 1 > events/sched/sched_switch/enable
> +
> +yield
> +
> +count=`cat trace | grep sched_switch | grep -v "pid=$mypid" | wc -l`
> +if [ $count -eq 0 ]; then
> + fail "sched_switch events from other task are not recorded"
> +fi
> +
> +do_reset
> +
> +exit 0
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] kselftests/ftrace: Add a test case for event pid filtering
2016-05-10 15:24 ` Shuah Khan
@ 2016-05-16 16:12 ` Shuah Khan
0 siblings, 0 replies; 6+ messages in thread
From: Shuah Khan @ 2016-05-16 16:12 UTC (permalink / raw)
To: Namhyung Kim, Steven Rostedt
Cc: LKML, Masami Hiramatsu, linux-kselftest, Shuah Khan
On 05/10/2016 09:24 AM, Shuah Khan wrote:
> On 05/10/2016 08:53 AM, Namhyung Kim wrote:
>> Check event is filtered by set_event_pid and options/event-fork.
>>
>> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
>
> Looks good to me. Steve! Ack if you are good with this patch.
> I can get this into 4.8-rc1
>
> thanks,
> -- Shuah
Applied to linux-kselftest next for 4.7-rc1.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point
2016-05-10 14:53 [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point Namhyung Kim
2016-05-10 14:53 ` [PATCH 2/2] kselftests/ftrace: Add a test case for event pid filtering Namhyung Kim
@ 2016-05-10 15:24 ` Shuah Khan
2016-05-16 16:12 ` Shuah Khan
1 sibling, 1 reply; 6+ messages in thread
From: Shuah Khan @ 2016-05-10 15:24 UTC (permalink / raw)
To: Namhyung Kim, Steven Rostedt; +Cc: LKML, Masami Hiramatsu, linux-kselftest
On 05/10/2016 08:53 AM, Namhyung Kim wrote:
> Currently ftracetest assumes tracing directory is located under
> $DEBUGFS/tracing. But it's possible to mount tracefs directly without
> debugfs.
>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Looks good to me. Steve! Ack if you are good with this patch.
I can get this into 4.8-rc1
thanks,
-- Shuah
> ---
> tools/testing/selftests/ftrace/ftracetest | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest
> index da48812ab95e..4c6a0bf8ba79 100755
> --- a/tools/testing/selftests/ftrace/ftracetest
> +++ b/tools/testing/selftests/ftrace/ftracetest
> @@ -88,7 +88,12 @@ parse_opts() { # opts
>
> # Parameters
> DEBUGFS_DIR=`grep debugfs /proc/mounts | cut -f2 -d' ' | head -1`
> -TRACING_DIR=$DEBUGFS_DIR/tracing
> +if [ -z "$DEBUGFS_DIR" ]; then
> + TRACING_DIR=`grep tracefs /proc/mounts | cut -f2 -d' ' | head -1`
> +else
> + TRACING_DIR=$DEBUGFS_DIR/tracing
> +fi
> +
> TOP_DIR=`absdir $0`
> TEST_DIR=$TOP_DIR/test.d
> TEST_CASES=`find_testcases $TEST_DIR`
> @@ -102,7 +107,7 @@ parse_opts $*
> [ $DEBUG -ne 0 ] && set -x
>
> # Verify parameters
> -if [ -z "$DEBUGFS_DIR" -o ! -d "$TRACING_DIR" ]; then
> +if [ -z "$TRACING_DIR" -o ! -d "$TRACING_DIR" ]; then
> errexit "No ftrace directory found"
> fi
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point
2016-05-10 15:24 ` [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point Shuah Khan
@ 2016-05-16 16:12 ` Shuah Khan
0 siblings, 0 replies; 6+ messages in thread
From: Shuah Khan @ 2016-05-16 16:12 UTC (permalink / raw)
To: Namhyung Kim, Steven Rostedt
Cc: LKML, Masami Hiramatsu, linux-kselftest, Shuah Khan
On 05/10/2016 09:24 AM, Shuah Khan wrote:
> On 05/10/2016 08:53 AM, Namhyung Kim wrote:
>> Currently ftracetest assumes tracing directory is located under
>> $DEBUGFS/tracing. But it's possible to mount tracefs directly without
>> debugfs.
>>
>> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
>
> Looks good to me. Steve! Ack if you are good with this patch.
> I can get this into 4.8-rc1
>
Applied to linux-kselftest next for 4.7-rc1.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-05-16 16:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-10 14:53 [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point Namhyung Kim
2016-05-10 14:53 ` [PATCH 2/2] kselftests/ftrace: Add a test case for event pid filtering Namhyung Kim
2016-05-10 15:24 ` Shuah Khan
2016-05-16 16:12 ` Shuah Khan
2016-05-10 15:24 ` [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point Shuah Khan
2016-05-16 16:12 ` Shuah Khan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox