lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 320/633] selftests/ftrace: Change synthetic event name for inter-event-combined test
    Date
    From: Tom Zanussi <zanussi@kernel.org>

    [ Upstream commit 96378b2088faea68f1fb05ea6b9a566fc569a44c ]

    This test uses waking+wakeup_latency as an event name, which doesn't
    make sense since it includes an operator. Illegal names are now
    detected by the synthetic event command parsing, which causes this
    test to fail. Change the name to 'waking_plus_wakeup_latency' to
    prevent this.

    Link: https://lkml.kernel.org/r/a1ee2f76ff28ef7166fb788ca8be968887808920.1602598160.git.zanussi@kernel.org

    Fixes: f06eec4d0f2c (selftests: ftrace: Add inter-event hist triggers testcases)
    Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
    Tested-by: Masami Hiramatsu <mhiramat@kernel.org>
    Signed-off-by: Tom Zanussi <zanussi@kernel.org>
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../inter-event/trigger-inter-event-combined-hist.tc | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    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 7449a4b8f1f9a..9098f1e7433fd 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
    @@ -25,12 +25,12 @@ echo 'wakeup_latency u64 lat pid_t pid' >> synthetic_events
    echo 'hist:keys=pid:ts1=common_timestamp.usecs if comm=="ping"' >> events/sched/sched_wakeup/trigger
    echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts1:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid) if next_comm=="ping"' > events/sched/sched_switch/trigger

    -echo 'waking+wakeup_latency u64 lat; pid_t pid' >> synthetic_events
    -echo 'hist:keys=pid,lat:sort=pid,lat:ww_lat=$waking_lat+$wakeup_lat:onmatch(synthetic.wakeup_latency).waking+wakeup_latency($ww_lat,pid)' >> events/synthetic/wakeup_latency/trigger
    -echo 'hist:keys=pid,lat:sort=pid,lat' >> events/synthetic/waking+wakeup_latency/trigger
    +echo 'waking_plus_wakeup_latency u64 lat; pid_t pid' >> synthetic_events
    +echo 'hist:keys=pid,lat:sort=pid,lat:ww_lat=$waking_lat+$wakeup_lat:onmatch(synthetic.wakeup_latency).waking_plus_wakeup_latency($ww_lat,pid)' >> events/synthetic/wakeup_latency/trigger
    +echo 'hist:keys=pid,lat:sort=pid,lat' >> events/synthetic/waking_plus_wakeup_latency/trigger

    ping $LOCALHOST -c 3
    -if ! grep -q "pid:" events/synthetic/waking+wakeup_latency/hist; then
    +if ! grep -q "pid:" events/synthetic/waking_plus_wakeup_latency/hist; then
    fail "Failed to create combined histogram"
    fi

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 16:07    [W:4.041 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site