Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list
On 6/17/20 8:58 AM, Masami Hiramatsu wrote: Hi Shuah, On Tue, 16 Jun 2020 10:48:12 -0600 Shuah Khan wrote: On 6/11/20 6:03 AM, Shuah Khan wrote: On 6/10/20 7:32 AM, Steven Rostedt wrote: On Wed, 10 Jun 2020 06:04:33 -0600 Shuah Khan wrote: Steve, what would you think? No worries. As far as kselftest tree is concrned, I can apply these after rc1 comes out with Tom's patch. Or I can give Ack and Steve can take these through tracing tree. All my patches have already made it to Linus's tree. Perhaps cherry-pick the commit needed from Linus's tree (it shouldn't break anything when Linus pulls it). Just let Linus know what you did, and everything should be fine. Good to know. I will get these in. I applied all 7 patches to linux-kselftest next for my second update. I saw a couple of merge problems with 4/7 patch even when I applied it on top of with Tom's patch. Oh, I might miss something. I resolved them and amended the commit message to indicate the merge. It is straight forward. Please check for sanity. Yes, I confirmed that the merge looks good, and also test ran out without any error. :) Thanks for confirming. Pull request going out today. thanks, -- Shuah
Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list
Hi Shuah, On Tue, 16 Jun 2020 10:48:12 -0600 Shuah Khan wrote: > On 6/11/20 6:03 AM, Shuah Khan wrote: > > On 6/10/20 7:32 AM, Steven Rostedt wrote: > >> On Wed, 10 Jun 2020 06:04:33 -0600 > >> Shuah Khan wrote: > >> > Steve, what would you think? > >>> > >>> No worries. As far as kselftest tree is concrned, I can apply these > >>> after rc1 comes out with Tom's patch. > >>> > >>> Or I can give Ack and Steve can take these through tracing tree. > >> > >> All my patches have already made it to Linus's tree. Perhaps > >> cherry-pick the commit needed from Linus's tree (it shouldn't break > >> anything when Linus pulls it). Just let Linus know what you did, and > >> everything should be fine. > >> > > > > Good to know. I will get these in. > > > > I applied all 7 patches to linux-kselftest next for my second update. > I saw a couple of merge problems with 4/7 patch even when I applied > it on top of with Tom's patch. Oh, I might miss something. > > I resolved them and amended the commit message to indicate the merge. > It is straight forward. Please check for sanity. Yes, I confirmed that the merge looks good, and also test ran out without any error. :) Thank you! > > thanks, > -- Shuah -- Masami Hiramatsu
Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list
On 6/11/20 6:03 AM, Shuah Khan wrote: On 6/10/20 7:32 AM, Steven Rostedt wrote: On Wed, 10 Jun 2020 06:04:33 -0600 Shuah Khan wrote: Steve, what would you think? No worries. As far as kselftest tree is concrned, I can apply these after rc1 comes out with Tom's patch. Or I can give Ack and Steve can take these through tracing tree. All my patches have already made it to Linus's tree. Perhaps cherry-pick the commit needed from Linus's tree (it shouldn't break anything when Linus pulls it). Just let Linus know what you did, and everything should be fine. Good to know. I will get these in. I applied all 7 patches to linux-kselftest next for my second update. I saw a couple of merge problems with 4/7 patch even when I applied it on top of with Tom's patch. I resolved them and amended the commit message to indicate the merge. It is straight forward. Please check for sanity. thanks, -- Shuah
Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list
On Thu, 11 Jun 2020 06:03:50 -0600 Shuah Khan wrote: > On 6/10/20 7:32 AM, Steven Rostedt wrote: > > On Wed, 10 Jun 2020 06:04:33 -0600 > > Shuah Khan wrote: > > > >>> Steve, what would you think? > >>> > >> > >> No worries. As far as kselftest tree is concrned, I can apply these > >> after rc1 comes out with Tom's patch. > >> > >> Or I can give Ack and Steve can take these through tracing tree. > > > > All my patches have already made it to Linus's tree. Perhaps > > cherry-pick the commit needed from Linus's tree (it shouldn't break > > anything when Linus pulls it). Just let Linus know what you did, and > > everything should be fine. > > > > Good to know. I will get these in. Thanks Shuah and Steve! -- Masami Hiramatsu
Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list
On 6/10/20 7:32 AM, Steven Rostedt wrote: On Wed, 10 Jun 2020 06:04:33 -0600 Shuah Khan wrote: Steve, what would you think? No worries. As far as kselftest tree is concrned, I can apply these after rc1 comes out with Tom's patch. Or I can give Ack and Steve can take these through tracing tree. All my patches have already made it to Linus's tree. Perhaps cherry-pick the commit needed from Linus's tree (it shouldn't break anything when Linus pulls it). Just let Linus know what you did, and everything should be fine. Good to know. I will get these in. thanks, -- Shuah
Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list
On Wed, 10 Jun 2020 06:04:33 -0600 Shuah Khan wrote: > > Steve, what would you think? > > > > No worries. As far as kselftest tree is concrned, I can apply these > after rc1 comes out with Tom's patch. > > Or I can give Ack and Steve can take these through tracing tree. All my patches have already made it to Linus's tree. Perhaps cherry-pick the commit needed from Linus's tree (it shouldn't break anything when Linus pulls it). Just let Linus know what you did, and everything should be fine. -- Steve
Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list
On 6/9/20 11:55 PM, Masami Hiramatsu wrote:
Hi Shuah,
On Tue, 9 Jun 2020 14:41:27 -0600
Shuah Khan wrote:
On 6/2/20 8:40 PM, Masami Hiramatsu wrote:
Convert the required tracefs interface checking code with
requires: list.
Signed-off-by: Masami Hiramatsu
Reviewed-by: Tom Zanussi
---
Changes in v2: Fix trigger-onchange-action-hist.tc requires list.
Masami,
This patch doesn't apply to linux-kselftest next
Patches 1-3 applied fine and this one failed. For now I will
hold off on applying this series.
Yes, there is another patch posted by Tom with his ftrace enhancement
in tracing-next. Thus I commented on 0/7 as below.
Sorry I made a note of it when I first looked at the series and
missed that when I was applying patches.
Since this series depends on following 2 commits,
commit 619ee76f5c9f ("selftests/ftrace: Return unsupported if no
error_log file") on Shuah's Kselftest tree
commit bea24f766efc ("selftests/ftrace: Distinguish between hist
and synthetic event checks") on Steven's Tracing tree
This can be applied on the tree which merged both of them.
I'm not sure how do I handle it. It is OK just modifying this
for linux-kselftest, but in that case we will need another
patch after merged both.
IMHO, since the kselftest must run correctly on older kernel,
(and ftracetest does) Tom's kselftest patch should be merged
into linux-kselftest instead of tracing tree.
Steve, what would you think?
No worries. As far as kselftest tree is concrned, I can apply these
after rc1 comes out with Tom's patch.
Or I can give Ack and Steve can take these through tracing tree.
thanks,
-- Shuah
Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list
Hi Shuah,
On Tue, 9 Jun 2020 14:41:27 -0600
Shuah Khan wrote:
> On 6/2/20 8:40 PM, Masami Hiramatsu wrote:
> > Convert the required tracefs interface checking code with
> > requires: list.
> >
> > Signed-off-by: Masami Hiramatsu
> > Reviewed-by: Tom Zanussi
> > ---
> >Changes in v2: Fix trigger-onchange-action-hist.tc requires list.
>
> Masami,
>
> This patch doesn't apply to linux-kselftest next
>
> Patches 1-3 applied fine and this one failed. For now I will
> hold off on applying this series.
Yes, there is another patch posted by Tom with his ftrace enhancement
in tracing-next. Thus I commented on 0/7 as below.
Since this series depends on following 2 commits,
commit 619ee76f5c9f ("selftests/ftrace: Return unsupported if no
error_log file") on Shuah's Kselftest tree
commit bea24f766efc ("selftests/ftrace: Distinguish between hist
and synthetic event checks") on Steven's Tracing tree
This can be applied on the tree which merged both of them.
I'm not sure how do I handle it. It is OK just modifying this
for linux-kselftest, but in that case we will need another
patch after merged both.
IMHO, since the kselftest must run correctly on older kernel,
(and ftracetest does) Tom's kselftest patch should be merged
into linux-kselftest instead of tracing tree.
Steve, what would you think?
Thank you,
--
Masami Hiramatsu
Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list
On 6/2/20 8:40 PM, Masami Hiramatsu wrote: Convert the required tracefs interface checking code with requires: list. Signed-off-by: Masami Hiramatsu Reviewed-by: Tom Zanussi --- Changes in v2: Fix trigger-onchange-action-hist.tc requires list. Masami, This patch doesn't apply to linux-kselftest next Patches 1-3 applied fine and this one failed. For now I will hold off on applying this series. thanks, -- Shuah
[PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list
Convert the required tracefs interface checking code with requires: list. Signed-off-by: Masami Hiramatsu Reviewed-by: Tom Zanussi --- Changes in v2: Fix trigger-onchange-action-hist.tc requires list. --- .../selftests/ftrace/test.d/00basic/snapshot.tc|3 +- .../selftests/ftrace/test.d/00basic/trace_pipe.tc |3 +- .../ftrace/test.d/direct/kprobe-direct.tc |6 +--- .../ftrace/test.d/dynevent/add_remove_kprobe.tc|3 +- .../ftrace/test.d/dynevent/add_remove_synth.tc |3 +- .../ftrace/test.d/dynevent/clear_select_events.tc |6 +--- .../ftrace/test.d/dynevent/generic_clear_event.tc |3 +- .../selftests/ftrace/test.d/event/event-enable.tc |6 +--- .../selftests/ftrace/test.d/event/event-no-pid.tc | 11 +-- .../selftests/ftrace/test.d/event/event-pid.tc | 11 +-- .../ftrace/test.d/event/subsystem-enable.tc|6 +--- .../ftrace/test.d/event/toplevel-enable.tc |6 +--- .../ftrace/test.d/ftrace/fgraph-filter-stack.tc|7 + .../test.d/ftrace/func-filter-notrace-pid.tc |6 +--- .../ftrace/test.d/ftrace/func-filter-pid.tc|6 +--- .../ftrace/test.d/ftrace/func_profile_stat.tc |3 +- .../ftrace/test.d/ftrace/func_profiler.tc |6 +--- .../ftrace/test.d/ftrace/func_stack_tracer.tc |6 +--- .../ftrace/test.d/ftrace/tracing-error-log.tc | 12 ++-- .../ftrace/test.d/instances/instance-event.tc |6 +--- .../selftests/ftrace/test.d/instances/instance.tc |6 +--- .../ftrace/test.d/kprobe/add_and_remove.tc |3 +- .../selftests/ftrace/test.d/kprobe/busy_check.tc |3 +- .../selftests/ftrace/test.d/kprobe/kprobe_args.tc |3 +- .../ftrace/test.d/kprobe/kprobe_args_comm.tc |3 +- .../ftrace/test.d/kprobe/kprobe_args_string.tc |3 +- .../ftrace/test.d/kprobe/kprobe_args_symbol.tc |3 +- .../ftrace/test.d/kprobe/kprobe_args_syntax.tc |3 +- .../ftrace/test.d/kprobe/kprobe_args_type.tc |3 +- .../ftrace/test.d/kprobe/kprobe_args_user.tc |3 +- .../ftrace/test.d/kprobe/kprobe_eventname.tc |3 +- .../ftrace/test.d/kprobe/kprobe_ftrace.tc |2 + .../ftrace/test.d/kprobe/kprobe_module.tc |3 +- .../ftrace/test.d/kprobe/kprobe_multiprobe.tc |3 +- .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc |5 +-- .../ftrace/test.d/kprobe/kretprobe_args.tc |3 +- .../ftrace/test.d/kprobe/kretprobe_maxactive.tc|2 + .../ftrace/test.d/kprobe/multiple_kprobes.tc |3 +- .../selftests/ftrace/test.d/kprobe/probepoint.tc |3 +- .../selftests/ftrace/test.d/kprobe/profile.tc |3 +- .../ftrace/test.d/kprobe/uprobe_syntax_errors.tc |5 +-- .../inter-event/trigger-action-hist-xfail.tc | 11 +-- .../inter-event/trigger-field-variable-support.tc | 16 +- .../trigger-inter-event-combined-hist.tc | 16 +- .../inter-event/trigger-multi-actions-accept.tc| 16 +- .../inter-event/trigger-onchange-action-hist.tc|6 +--- .../inter-event/trigger-onmatch-action-hist.tc | 16 +- .../trigger-onmatch-onmax-action-hist.tc | 16 +- .../inter-event/trigger-onmax-action-hist.tc | 16 +- .../inter-event/trigger-snapshot-action-hist.tc| 16 +- .../trigger-synthetic-event-createremove.tc| 11 +-- .../inter-event/trigger-synthetic-event-syntax.tc | 11 +-- .../inter-event/trigger-trace-action-hist.tc | 16 +- .../ftrace/test.d/trigger/trigger-eventonoff.tc| 11 +-- .../ftrace/test.d/trigger/trigger-filter.tc| 11 +-- .../ftrace/test.d/trigger/trigger-hist-mod.tc | 16 +- .../test.d/trigger/trigger-hist-syntax-errors.tc | 18 +--- .../ftrace/test.d/trigger/trigger-hist.tc | 16 +- .../ftrace/test.d/trigger/trigger-multihist.tc | 16 +- .../ftrace/test.d/trigger/trigger-snapshot.tc | 16 +- .../ftrace/test.d/trigger/trigger-stacktrace.tc| 11 +-- .../test.d/trigger/trigger-trace-marker-hist.tc| 21 +- .../trigger/trigger-trace-marker-snapshot.tc | 21 +- .../trigger-trace-marker-synthetic-kernel.tc | 31 +--- .../trigger/trigger-trace-marker-synthetic.tc | 26 + .../ftrace/test.d/trigger/trigger-traceonoff.tc| 11 +-- 66 files changed, 68 insertions(+), 511 deletions(-) diff --git a/tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc b/tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc index 3b1f45e13a2e..13b4dabcf46e 100644 --- a/tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc +++ b/tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc @@ -1,9 +1,8 @@ #!/bin/sh # description: Snapshot and tracing setting +# requires: snapshot #
