[PATCH 1/2] kselftests/ftrace: Detect tracefs mount point

[PATCH 1/2] kselftests/ftrace: Detect tracefs mount point

[Namhyung Kim]

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

[PATCH 2/2] kselftests/ftrace: Add a test case for event pid filtering

[Namhyung Kim]

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

Re: [PATCH 2/2] kselftests/ftrace: Add a test case for event pid filtering

[Shuah Khan]

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
> 

Re: [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point

[Shuah Khan]

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
>  
> 

Re: [PATCH 2/2] kselftests/ftrace: Add a test case for event pid filtering

[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

Re: [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point

[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