lkml.org 
[lkml]   [2019]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 37/87] perf test: Fix failure of 'evsel-tp-sched' test on s390
    Date
    From: Thomas Richter <tmricht@linux.ibm.com>

    [ Upstream commit 03d309711d687460d1345de8a0363f45b1c8cd11 ]

    Commit 489338a717a0 ("perf tests evsel-tp-sched: Fix bitwise operator")
    causes test case 14 "Parse sched tracepoints fields" to fail on s390.

    This test succeeds on x86.

    In fact this test now fails on all architectures with type char treated
    as type unsigned char.

    The root cause is the signed-ness of character arrays in the tracepoints
    sched_switch for structure members prev_comm and next_comm.

    On s390 the output of:

    [root@m35lp76 perf]# cat /sys/kernel/debug/tracing/events/sched/sched_switch/format
    name: sched_switch
    ID: 287
    format:
    field:unsigned short common_type; offset:0; size:2; signed:0;
    ...
    field:char prev_comm[16]; offset:8; size:16; signed:0;
    ...
    field:char next_comm[16]; offset:40; size:16; signed:0;

    reveals the character arrays prev_comm and next_comm are per
    default unsigned char and have values in the range of 0..255.

    On x86 both fields are signed as this output shows:
    [root@f29]# cat /sys/kernel/debug/tracing/events/sched/sched_switch/format
    name: sched_switch
    ID: 287
    format:
    field:unsigned short common_type; offset:0; size:2; signed:0;
    ...
    field:char prev_comm[16]; offset:8; size:16; signed:1;
    ...
    field:char next_comm[16]; offset:40; size:16; signed:1;

    and the character arrays prev_comm and next_comm are per default signed
    char and have values in the range of -1..127. The implementation of
    type char is architecture specific.

    Since the character arrays in both tracepoints sched_switch and
    sched_wakeup should contain ascii characters, simply omit the check for
    signedness in the test case.

    Output before:

    [root@m35lp76 perf]# ./perf test -F 14
    14: Parse sched tracepoints fields :
    --- start ---
    sched:sched_switch: "prev_comm" signedness(0) is wrong, should be 1
    sched:sched_switch: "next_comm" signedness(0) is wrong, should be 1
    sched:sched_wakeup: "comm" signedness(0) is wrong, should be 1
    ---- end ----
    14: Parse sched tracepoints fields : FAILED!
    [root@m35lp76 perf]#

    Output after:

    [root@m35lp76 perf]# ./perf test -Fv 14
    14: Parse sched tracepoints fields :
    --- start ---
    ---- end ----
    Parse sched tracepoints fields: Ok
    [root@m35lp76 perf]#

    Fixes: 489338a717a0 ("perf tests evsel-tp-sched: Fix bitwise operator")

    Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Link: http://lkml.kernel.org/r/20190219153639.31267-1-tmricht@linux.ibm.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/perf/tests/evsel-tp-sched.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/tools/perf/tests/evsel-tp-sched.c b/tools/perf/tests/evsel-tp-sched.c
    index 66b53f10eb18..ea772d41e472 100644
    --- a/tools/perf/tests/evsel-tp-sched.c
    +++ b/tools/perf/tests/evsel-tp-sched.c
    @@ -42,7 +42,7 @@ int test__perf_evsel__tp_sched_test(int subtest __maybe_unused)
    return -1;
    }

    - if (perf_evsel__test_field(evsel, "prev_comm", 16, true))
    + if (perf_evsel__test_field(evsel, "prev_comm", 16, false))
    ret = -1;

    if (perf_evsel__test_field(evsel, "prev_pid", 4, true))
    @@ -54,7 +54,7 @@ int test__perf_evsel__tp_sched_test(int subtest __maybe_unused)
    if (perf_evsel__test_field(evsel, "prev_state", sizeof(long), true))
    ret = -1;

    - if (perf_evsel__test_field(evsel, "next_comm", 16, true))
    + if (perf_evsel__test_field(evsel, "next_comm", 16, false))
    ret = -1;

    if (perf_evsel__test_field(evsel, "next_pid", 4, true))
    @@ -72,7 +72,7 @@ int test__perf_evsel__tp_sched_test(int subtest __maybe_unused)
    return -1;
    }

    - if (perf_evsel__test_field(evsel, "comm", 16, true))
    + if (perf_evsel__test_field(evsel, "comm", 16, false))
    ret = -1;

    if (perf_evsel__test_field(evsel, "pid", 4, true))
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-03-27 19:43    [W:4.264 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site