* [PATCH v2 0/2] selftests/ftrace: Capture dependency on external
@ 2022-10-18 14:02 Naveen N. Rao
2022-10-18 14:03 ` [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs Naveen N. Rao
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Naveen N. Rao @ 2022-10-18 14:02 UTC (permalink / raw)
To: Steven Rostedt, Shuah Khan; +Cc: linux-kernel, Masami Hiramatsu, Akanksha J N
This is v2 of the below patch:
http://lkml.kernel.org/r/20221017101927.303547-1-naveen.n.rao@linux.vnet.ibm.com
The second patch is new, and converts some other tests to use the new
way of specifying dependency on external programs.
- Naveen
Naveen N. Rao (2):
selftests/ftrace: Add check for ping command for trigger tests
selftests/ftrace: Convert tracer tests to use 'requires' to specify
program dependency
tools/testing/selftests/ftrace/test.d/functions | 8 +++++++-
tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc | 7 +------
tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc | 7 +------
.../trigger/inter-event/trigger-field-variable-support.tc | 2 +-
.../inter-event/trigger-inter-event-combined-hist.tc | 2 +-
.../trigger/inter-event/trigger-onchange-action-hist.tc | 2 +-
.../trigger/inter-event/trigger-onmatch-action-hist.tc | 2 +-
.../inter-event/trigger-onmatch-onmax-action-hist.tc | 2 +-
.../trigger/inter-event/trigger-onmax-action-hist.tc | 2 +-
.../trigger/inter-event/trigger-snapshot-action-hist.tc | 2 +-
.../inter-event/trigger-synthetic-event-dynstring.tc | 2 +-
.../trigger/inter-event/trigger-trace-action-hist.tc | 2 +-
12 files changed, 18 insertions(+), 22 deletions(-)
base-commit: 6c0f39e87b6ab1a3009e3a49d3e6f6db8dc756a8
--
2.38.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs
2022-10-18 14:02 [PATCH v2 0/2] selftests/ftrace: Capture dependency on external Naveen N. Rao
@ 2022-10-18 14:03 ` Naveen N. Rao
2022-10-18 14:03 ` [PATCH v2 1/2] selftests/ftrace: Add check for ping command for trigger tests Naveen N. Rao
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Naveen N. Rao @ 2022-10-18 14:03 UTC (permalink / raw)
To: Steven Rostedt, Shuah Khan; +Cc: linux-kernel, Masami Hiramatsu, Akanksha J N
This is v2 of the below patch:
http://lkml.kernel.org/r/20221017101927.303547-1-naveen.n.rao@linux.vnet.ibm.com
The second patch is new, and converts some other tests to use the new
way of specifying dependency on external programs.
- Naveen
Naveen N. Rao (2):
selftests/ftrace: Add check for ping command for trigger tests
selftests/ftrace: Convert tracer tests to use 'requires' to specify
program dependency
tools/testing/selftests/ftrace/test.d/functions | 8 +++++++-
tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc | 7 +------
tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc | 7 +------
.../trigger/inter-event/trigger-field-variable-support.tc | 2 +-
.../inter-event/trigger-inter-event-combined-hist.tc | 2 +-
.../trigger/inter-event/trigger-onchange-action-hist.tc | 2 +-
.../trigger/inter-event/trigger-onmatch-action-hist.tc | 2 +-
.../inter-event/trigger-onmatch-onmax-action-hist.tc | 2 +-
.../trigger/inter-event/trigger-onmax-action-hist.tc | 2 +-
.../trigger/inter-event/trigger-snapshot-action-hist.tc | 2 +-
.../inter-event/trigger-synthetic-event-dynstring.tc | 2 +-
.../trigger/inter-event/trigger-trace-action-hist.tc | 2 +-
12 files changed, 18 insertions(+), 22 deletions(-)
base-commit: 6c0f39e87b6ab1a3009e3a49d3e6f6db8dc756a8
--
2.38.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/2] selftests/ftrace: Add check for ping command for trigger tests
2022-10-18 14:02 [PATCH v2 0/2] selftests/ftrace: Capture dependency on external Naveen N. Rao
2022-10-18 14:03 ` [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs Naveen N. Rao
@ 2022-10-18 14:03 ` Naveen N. Rao
2022-10-18 14:28 ` Steven Rostedt
2022-10-19 15:37 ` Masami Hiramatsu
2022-10-18 14:03 ` [PATCH v2 2/2] selftests/ftrace: Convert tracer tests to use 'requires' to specify program dependency Naveen N. Rao
2022-10-18 14:30 ` [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs Steven Rostedt
3 siblings, 2 replies; 10+ messages in thread
From: Naveen N. Rao @ 2022-10-18 14:03 UTC (permalink / raw)
To: Steven Rostedt, Shuah Khan; +Cc: linux-kernel, Masami Hiramatsu, Akanksha J N
All these tests depend on the ping command and will fail if it is not
found. Allow tests to specify dependencies on programs through the
'requires' field. Add dependency on 'ping' for some of the trigger
tests.
Reported-by: Akanksha J N <akanksha@linux.vnet.ibm.com>
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
tools/testing/selftests/ftrace/test.d/functions | 8 +++++++-
.../trigger/inter-event/trigger-field-variable-support.tc | 2 +-
.../inter-event/trigger-inter-event-combined-hist.tc | 2 +-
.../trigger/inter-event/trigger-onchange-action-hist.tc | 2 +-
.../trigger/inter-event/trigger-onmatch-action-hist.tc | 2 +-
.../inter-event/trigger-onmatch-onmax-action-hist.tc | 2 +-
.../trigger/inter-event/trigger-onmax-action-hist.tc | 2 +-
.../trigger/inter-event/trigger-snapshot-action-hist.tc | 2 +-
.../inter-event/trigger-synthetic-event-dynstring.tc | 2 +-
.../trigger/inter-event/trigger-trace-action-hist.tc | 2 +-
10 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions
index 5f6cbec847fc99..779f3e62ec9005 100644
--- a/tools/testing/selftests/ftrace/test.d/functions
+++ b/tools/testing/selftests/ftrace/test.d/functions
@@ -142,9 +142,15 @@ finish_ftrace() {
check_requires() { # Check required files and tracers
for i in "$@" ; do
+ p=${i%:program}
r=${i%:README}
t=${i%:tracer}
- if [ $t != $i ]; then
+ if [ $p != $i ]; then
+ if ! which $p ; then
+ echo "Required program $p is not found."
+ exit_unresolved
+ fi
+ elif [ $t != $i ]; then
if ! grep -wq $t available_tracers ; then
echo "Required tracer $t is not configured."
exit_unsupported
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
index 41119e0440e960..04c5dd7d0acc4b 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
@@ -1,7 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: event trigger - test field variable support
-# requires: set_event synthetic_events events/sched/sched_process_fork/hist
+# requires: set_event synthetic_events events/sched/sched_process_fork/hist ping:program
fail() { #msg
echo $1
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
index 9098f1e7433fd0..f7447d800899ac 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
@@ -1,7 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: event trigger - test inter-event combined histogram trigger
-# requires: set_event synthetic_events events/sched/sched_process_fork/hist
+# requires: set_event synthetic_events events/sched/sched_process_fork/hist ping:program
fail() { #msg
echo $1
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc
index adaabb873ed4ab..91339c1308324b 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc
@@ -1,7 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: event trigger - test inter-event histogram trigger onchange action
-# requires: set_event "onchange(var)":README
+# requires: set_event "onchange(var)":README ping:program
fail() { #msg
echo $1
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
index 20e39471052e9a..d645abcf11c4f7 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
@@ -1,7 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: event trigger - test inter-event histogram trigger onmatch action
-# requires: set_event synthetic_events events/sched/sched_process_fork/hist
+# requires: set_event synthetic_events events/sched/sched_process_fork/hist ping:program
fail() { #msg
echo $1
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
index f4b03ab7c28714..c369247efb3501 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
@@ -1,7 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: event trigger - test inter-event histogram trigger onmatch-onmax action
-# requires: set_event synthetic_events events/sched/sched_process_fork/hist
+# requires: set_event synthetic_events events/sched/sched_process_fork/hist ping:program
fail() { #msg
echo $1
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
index 71c9b5911c7067..e28dc5f11b2be0 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
@@ -1,7 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: event trigger - test inter-event histogram trigger onmax action
-# requires: set_event synthetic_events events/sched/sched_process_fork/hist
+# requires: set_event synthetic_events events/sched/sched_process_fork/hist ping:program
fail() { #msg
echo $1
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc
index 67fa328b830f5f..147967e86584ac 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc
@@ -1,7 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: event trigger - test inter-event histogram trigger snapshot action
-# requires: set_event snapshot events/sched/sched_process_fork/hist "onchange(var)":README "snapshot()":README
+# requires: set_event snapshot events/sched/sched_process_fork/hist "onchange(var)":README "snapshot()":README ping:program
fail() { #msg
echo $1
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc
index 3d65c856eca3e6..213d890ed1886e 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc
@@ -1,7 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: event trigger - test inter-event histogram trigger trace action with dynamic string param
-# requires: set_event synthetic_events events/sched/sched_process_exec/hist "char name[]' >> synthetic_events":README
+# requires: set_event synthetic_events events/sched/sched_process_exec/hist "char name[]' >> synthetic_events":README ping:program
fail() { #msg
echo $1
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc
index c126d2350a6d41..d7312047ce2818 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc
@@ -1,7 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: event trigger - test inter-event histogram trigger trace action
-# requires: set_event synthetic_events events/sched/sched_process_fork/hist "trace(<synthetic_event>":README
+# requires: set_event synthetic_events events/sched/sched_process_fork/hist "trace(<synthetic_event>":README ping:program
fail() { #msg
echo $1
--
2.38.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] selftests/ftrace: Convert tracer tests to use 'requires' to specify program dependency
2022-10-18 14:02 [PATCH v2 0/2] selftests/ftrace: Capture dependency on external Naveen N. Rao
2022-10-18 14:03 ` [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs Naveen N. Rao
2022-10-18 14:03 ` [PATCH v2 1/2] selftests/ftrace: Add check for ping command for trigger tests Naveen N. Rao
@ 2022-10-18 14:03 ` Naveen N. Rao
2022-10-18 14:28 ` Steven Rostedt
2022-10-18 14:30 ` [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs Steven Rostedt
3 siblings, 1 reply; 10+ messages in thread
From: Naveen N. Rao @ 2022-10-18 14:03 UTC (permalink / raw)
To: Steven Rostedt, Shuah Khan; +Cc: linux-kernel, Masami Hiramatsu, Akanksha J N
Now that we have a good way to specify dependency of tests on programs,
convert some of the tracer tests to use this method for specifying
dependency on 'chrt'.
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc | 7 +------
tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc b/tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc
index 11be10e1bf966a..e8f0fac9a110cc 100644
--- a/tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc
+++ b/tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc
@@ -1,12 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: Test wakeup tracer
-# requires: wakeup:tracer
-
-if ! which chrt ; then
- echo "chrt is not found. This test requires nice command."
- exit_unresolved
-fi
+# requires: wakeup:tracer chrt:program
echo wakeup > current_tracer
echo 1 > tracing_on
diff --git a/tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc b/tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc
index 3a77198b3c6902..79807656785b0f 100644
--- a/tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc
+++ b/tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc
@@ -1,12 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# description: Test wakeup RT tracer
-# requires: wakeup_rt:tracer
-
-if ! which chrt ; then
- echo "chrt is not found. This test requires chrt command."
- exit_unresolved
-fi
+# requires: wakeup_rt:tracer chrt:program
echo wakeup_rt > current_tracer
echo 1 > tracing_on
--
2.38.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/2] selftests/ftrace: Add check for ping command for trigger tests
2022-10-18 14:03 ` [PATCH v2 1/2] selftests/ftrace: Add check for ping command for trigger tests Naveen N. Rao
@ 2022-10-18 14:28 ` Steven Rostedt
2022-10-19 15:37 ` Masami Hiramatsu
1 sibling, 0 replies; 10+ messages in thread
From: Steven Rostedt @ 2022-10-18 14:28 UTC (permalink / raw)
To: Naveen N. Rao; +Cc: Shuah Khan, linux-kernel, Masami Hiramatsu, Akanksha J N
On Tue, 18 Oct 2022 19:33:40 +0530
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> wrote:
> All these tests depend on the ping command and will fail if it is not
> found. Allow tests to specify dependencies on programs through the
> 'requires' field. Add dependency on 'ping' for some of the trigger
> tests.
>
Perhaps include:
Link: https://lore.kernel.org/all/20221017104312.16af5467@gandalf.local.home/
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-- Steve
> Reported-by: Akanksha J N <akanksha@linux.vnet.ibm.com>
> Suggested-by: Steven Rostedt <rostedt@goodmis.org>
> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] selftests/ftrace: Convert tracer tests to use 'requires' to specify program dependency
2022-10-18 14:03 ` [PATCH v2 2/2] selftests/ftrace: Convert tracer tests to use 'requires' to specify program dependency Naveen N. Rao
@ 2022-10-18 14:28 ` Steven Rostedt
0 siblings, 0 replies; 10+ messages in thread
From: Steven Rostedt @ 2022-10-18 14:28 UTC (permalink / raw)
To: Naveen N. Rao; +Cc: Shuah Khan, linux-kernel, Masami Hiramatsu, Akanksha J N
On Tue, 18 Oct 2022 19:33:41 +0530
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> wrote:
> Now that we have a good way to specify dependency of tests on programs,
> convert some of the tracer tests to use this method for specifying
> dependency on 'chrt'.
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-- Steve
>
> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs
2022-10-18 14:02 [PATCH v2 0/2] selftests/ftrace: Capture dependency on external Naveen N. Rao
` (2 preceding siblings ...)
2022-10-18 14:03 ` [PATCH v2 2/2] selftests/ftrace: Convert tracer tests to use 'requires' to specify program dependency Naveen N. Rao
@ 2022-10-18 14:30 ` Steven Rostedt
2022-10-24 16:22 ` Steven Rostedt
3 siblings, 1 reply; 10+ messages in thread
From: Steven Rostedt @ 2022-10-18 14:30 UTC (permalink / raw)
To: Naveen N. Rao
Cc: Shuah Khan, linux-kernel, Masami Hiramatsu, Akanksha J N, Shuah Khan
Masami,
If you are OK with this patch set, perhaps Shuah can take it through her
tree?
-- Steve
On Tue, 18 Oct 2022 19:33:39 +0530
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> wrote:
> This is v2 of the below patch:
> http://lkml.kernel.org/r/20221017101927.303547-1-naveen.n.rao@linux.vnet.ibm.com
>
> The second patch is new, and converts some other tests to use the new
> way of specifying dependency on external programs.
>
> - Naveen
>
>
> Naveen N. Rao (2):
> selftests/ftrace: Add check for ping command for trigger tests
> selftests/ftrace: Convert tracer tests to use 'requires' to specify
> program dependency
>
> tools/testing/selftests/ftrace/test.d/functions | 8 +++++++-
> tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc | 7 +------
> tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc | 7 +------
> .../trigger/inter-event/trigger-field-variable-support.tc | 2 +-
> .../inter-event/trigger-inter-event-combined-hist.tc | 2 +-
> .../trigger/inter-event/trigger-onchange-action-hist.tc | 2 +-
> .../trigger/inter-event/trigger-onmatch-action-hist.tc | 2 +-
> .../inter-event/trigger-onmatch-onmax-action-hist.tc | 2 +-
> .../trigger/inter-event/trigger-onmax-action-hist.tc | 2 +-
> .../trigger/inter-event/trigger-snapshot-action-hist.tc | 2 +-
> .../inter-event/trigger-synthetic-event-dynstring.tc | 2 +-
> .../trigger/inter-event/trigger-trace-action-hist.tc | 2 +-
> 12 files changed, 18 insertions(+), 22 deletions(-)
>
>
> base-commit: 6c0f39e87b6ab1a3009e3a49d3e6f6db8dc756a8
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/2] selftests/ftrace: Add check for ping command for trigger tests
2022-10-18 14:03 ` [PATCH v2 1/2] selftests/ftrace: Add check for ping command for trigger tests Naveen N. Rao
2022-10-18 14:28 ` Steven Rostedt
@ 2022-10-19 15:37 ` Masami Hiramatsu
1 sibling, 0 replies; 10+ messages in thread
From: Masami Hiramatsu @ 2022-10-19 15:37 UTC (permalink / raw)
To: Naveen N. Rao
Cc: Steven Rostedt, Shuah Khan, linux-kernel, Masami Hiramatsu, Akanksha J N
On Tue, 18 Oct 2022 19:33:40 +0530
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> wrote:
> All these tests depend on the ping command and will fail if it is not
> found. Allow tests to specify dependencies on programs through the
> 'requires' field. Add dependency on 'ping' for some of the trigger
> tests.
>
> Reported-by: Akanksha J N <akanksha@linux.vnet.ibm.com>
> Suggested-by: Steven Rostedt <rostedt@goodmis.org>
> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Thanks, this looks good to me.
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
> ---
> tools/testing/selftests/ftrace/test.d/functions | 8 +++++++-
> .../trigger/inter-event/trigger-field-variable-support.tc | 2 +-
> .../inter-event/trigger-inter-event-combined-hist.tc | 2 +-
> .../trigger/inter-event/trigger-onchange-action-hist.tc | 2 +-
> .../trigger/inter-event/trigger-onmatch-action-hist.tc | 2 +-
> .../inter-event/trigger-onmatch-onmax-action-hist.tc | 2 +-
> .../trigger/inter-event/trigger-onmax-action-hist.tc | 2 +-
> .../trigger/inter-event/trigger-snapshot-action-hist.tc | 2 +-
> .../inter-event/trigger-synthetic-event-dynstring.tc | 2 +-
> .../trigger/inter-event/trigger-trace-action-hist.tc | 2 +-
> 10 files changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions
> index 5f6cbec847fc99..779f3e62ec9005 100644
> --- a/tools/testing/selftests/ftrace/test.d/functions
> +++ b/tools/testing/selftests/ftrace/test.d/functions
> @@ -142,9 +142,15 @@ finish_ftrace() {
>
> check_requires() { # Check required files and tracers
> for i in "$@" ; do
> + p=${i%:program}
> r=${i%:README}
> t=${i%:tracer}
> - if [ $t != $i ]; then
> + if [ $p != $i ]; then
> + if ! which $p ; then
> + echo "Required program $p is not found."
> + exit_unresolved
> + fi
> + elif [ $t != $i ]; then
> if ! grep -wq $t available_tracers ; then
> echo "Required tracer $t is not configured."
> exit_unsupported
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
> index 41119e0440e960..04c5dd7d0acc4b 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: event trigger - test field variable support
> -# requires: set_event synthetic_events events/sched/sched_process_fork/hist
> +# requires: set_event synthetic_events events/sched/sched_process_fork/hist ping:program
>
> fail() { #msg
> echo $1
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
> index 9098f1e7433fd0..f7447d800899ac 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: event trigger - test inter-event combined histogram trigger
> -# requires: set_event synthetic_events events/sched/sched_process_fork/hist
> +# requires: set_event synthetic_events events/sched/sched_process_fork/hist ping:program
>
> fail() { #msg
> echo $1
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc
> index adaabb873ed4ab..91339c1308324b 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: event trigger - test inter-event histogram trigger onchange action
> -# requires: set_event "onchange(var)":README
> +# requires: set_event "onchange(var)":README ping:program
>
> fail() { #msg
> echo $1
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
> index 20e39471052e9a..d645abcf11c4f7 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: event trigger - test inter-event histogram trigger onmatch action
> -# requires: set_event synthetic_events events/sched/sched_process_fork/hist
> +# requires: set_event synthetic_events events/sched/sched_process_fork/hist ping:program
>
> fail() { #msg
> echo $1
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
> index f4b03ab7c28714..c369247efb3501 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: event trigger - test inter-event histogram trigger onmatch-onmax action
> -# requires: set_event synthetic_events events/sched/sched_process_fork/hist
> +# requires: set_event synthetic_events events/sched/sched_process_fork/hist ping:program
>
> fail() { #msg
> echo $1
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
> index 71c9b5911c7067..e28dc5f11b2be0 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: event trigger - test inter-event histogram trigger onmax action
> -# requires: set_event synthetic_events events/sched/sched_process_fork/hist
> +# requires: set_event synthetic_events events/sched/sched_process_fork/hist ping:program
>
> fail() { #msg
> echo $1
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc
> index 67fa328b830f5f..147967e86584ac 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: event trigger - test inter-event histogram trigger snapshot action
> -# requires: set_event snapshot events/sched/sched_process_fork/hist "onchange(var)":README "snapshot()":README
> +# requires: set_event snapshot events/sched/sched_process_fork/hist "onchange(var)":README "snapshot()":README ping:program
>
> fail() { #msg
> echo $1
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc
> index 3d65c856eca3e6..213d890ed1886e 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: event trigger - test inter-event histogram trigger trace action with dynamic string param
> -# requires: set_event synthetic_events events/sched/sched_process_exec/hist "char name[]' >> synthetic_events":README
> +# requires: set_event synthetic_events events/sched/sched_process_exec/hist "char name[]' >> synthetic_events":README ping:program
>
> fail() { #msg
> echo $1
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc
> index c126d2350a6d41..d7312047ce2818 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: event trigger - test inter-event histogram trigger trace action
> -# requires: set_event synthetic_events events/sched/sched_process_fork/hist "trace(<synthetic_event>":README
> +# requires: set_event synthetic_events events/sched/sched_process_fork/hist "trace(<synthetic_event>":README ping:program
>
> fail() { #msg
> echo $1
> --
> 2.38.0
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs
2022-10-18 14:30 ` [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs Steven Rostedt
@ 2022-10-24 16:22 ` Steven Rostedt
2022-10-24 16:25 ` Shuah Khan
0 siblings, 1 reply; 10+ messages in thread
From: Steven Rostedt @ 2022-10-24 16:22 UTC (permalink / raw)
To: Naveen N. Rao
Cc: Shuah Khan, linux-kernel, Masami Hiramatsu, Akanksha J N, Shuah Khan
Hi Shuah,
Can you take this through your tree?
-- Steve
On Tue, 18 Oct 2022 10:30:33 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> Masami,
>
> If you are OK with this patch set, perhaps Shuah can take it through her
> tree?
>
> -- Steve
>
>
> On Tue, 18 Oct 2022 19:33:39 +0530
> "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> wrote:
>
> > This is v2 of the below patch:
> > http://lkml.kernel.org/r/20221017101927.303547-1-naveen.n.rao@linux.vnet.ibm.com
> >
> > The second patch is new, and converts some other tests to use the new
> > way of specifying dependency on external programs.
> >
> > - Naveen
> >
> >
> > Naveen N. Rao (2):
> > selftests/ftrace: Add check for ping command for trigger tests
> > selftests/ftrace: Convert tracer tests to use 'requires' to specify
> > program dependency
> >
> > tools/testing/selftests/ftrace/test.d/functions | 8 +++++++-
> > tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc | 7 +------
> > tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc | 7 +------
> > .../trigger/inter-event/trigger-field-variable-support.tc | 2 +-
> > .../inter-event/trigger-inter-event-combined-hist.tc | 2 +-
> > .../trigger/inter-event/trigger-onchange-action-hist.tc | 2 +-
> > .../trigger/inter-event/trigger-onmatch-action-hist.tc | 2 +-
> > .../inter-event/trigger-onmatch-onmax-action-hist.tc | 2 +-
> > .../trigger/inter-event/trigger-onmax-action-hist.tc | 2 +-
> > .../trigger/inter-event/trigger-snapshot-action-hist.tc | 2 +-
> > .../inter-event/trigger-synthetic-event-dynstring.tc | 2 +-
> > .../trigger/inter-event/trigger-trace-action-hist.tc | 2 +-
> > 12 files changed, 18 insertions(+), 22 deletions(-)
> >
> >
> > base-commit: 6c0f39e87b6ab1a3009e3a49d3e6f6db8dc756a8
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs
2022-10-24 16:22 ` Steven Rostedt
@ 2022-10-24 16:25 ` Shuah Khan
0 siblings, 0 replies; 10+ messages in thread
From: Shuah Khan @ 2022-10-24 16:25 UTC (permalink / raw)
To: Steven Rostedt, Naveen N. Rao
Cc: Shuah Khan, linux-kernel, Masami Hiramatsu, Akanksha J N, Shuah Khan
On 10/24/22 10:22, Steven Rostedt wrote:
>
> Hi Shuah,
>
> Can you take this through your tree?
>
> -- Steve
>
Yes. I will take this through my tree.
Naveen, please send it to linux-kselftest list with all the
reviewed by tags.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-10-24 18:19 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-18 14:02 [PATCH v2 0/2] selftests/ftrace: Capture dependency on external Naveen N. Rao
2022-10-18 14:03 ` [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs Naveen N. Rao
2022-10-18 14:03 ` [PATCH v2 1/2] selftests/ftrace: Add check for ping command for trigger tests Naveen N. Rao
2022-10-18 14:28 ` Steven Rostedt
2022-10-19 15:37 ` Masami Hiramatsu
2022-10-18 14:03 ` [PATCH v2 2/2] selftests/ftrace: Convert tracer tests to use 'requires' to specify program dependency Naveen N. Rao
2022-10-18 14:28 ` Steven Rostedt
2022-10-18 14:30 ` [PATCH v2 0/2] selftests/ftrace: Capture dependency on external programs Steven Rostedt
2022-10-24 16:22 ` Steven Rostedt
2022-10-24 16:25 ` Shuah Khan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).