forked from luck/tmp_suning_uos_patched
03d309711d
Commit489338a717("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:489338a717("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>
90 lines
2.1 KiB
C
90 lines
2.1 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/err.h>
|
|
#include <traceevent/event-parse.h>
|
|
#include "evsel.h"
|
|
#include "tests.h"
|
|
#include "debug.h"
|
|
|
|
static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
|
|
int size, bool should_be_signed)
|
|
{
|
|
struct tep_format_field *field = perf_evsel__field(evsel, name);
|
|
int is_signed;
|
|
int ret = 0;
|
|
|
|
if (field == NULL) {
|
|
pr_debug("%s: \"%s\" field not found!\n", evsel->name, name);
|
|
return -1;
|
|
}
|
|
|
|
is_signed = !!(field->flags & TEP_FIELD_IS_SIGNED);
|
|
if (should_be_signed && !is_signed) {
|
|
pr_debug("%s: \"%s\" signedness(%d) is wrong, should be %d\n",
|
|
evsel->name, name, is_signed, should_be_signed);
|
|
ret = -1;
|
|
}
|
|
|
|
if (field->size != size) {
|
|
pr_debug("%s: \"%s\" size (%d) should be %d!\n",
|
|
evsel->name, name, field->size, size);
|
|
ret = -1;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
struct perf_evsel *evsel = perf_evsel__newtp("sched", "sched_switch");
|
|
int ret = 0;
|
|
|
|
if (IS_ERR(evsel)) {
|
|
pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel));
|
|
return -1;
|
|
}
|
|
|
|
if (perf_evsel__test_field(evsel, "prev_comm", 16, false))
|
|
ret = -1;
|
|
|
|
if (perf_evsel__test_field(evsel, "prev_pid", 4, true))
|
|
ret = -1;
|
|
|
|
if (perf_evsel__test_field(evsel, "prev_prio", 4, true))
|
|
ret = -1;
|
|
|
|
if (perf_evsel__test_field(evsel, "prev_state", sizeof(long), true))
|
|
ret = -1;
|
|
|
|
if (perf_evsel__test_field(evsel, "next_comm", 16, false))
|
|
ret = -1;
|
|
|
|
if (perf_evsel__test_field(evsel, "next_pid", 4, true))
|
|
ret = -1;
|
|
|
|
if (perf_evsel__test_field(evsel, "next_prio", 4, true))
|
|
ret = -1;
|
|
|
|
perf_evsel__delete(evsel);
|
|
|
|
evsel = perf_evsel__newtp("sched", "sched_wakeup");
|
|
|
|
if (IS_ERR(evsel)) {
|
|
pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel));
|
|
return -1;
|
|
}
|
|
|
|
if (perf_evsel__test_field(evsel, "comm", 16, false))
|
|
ret = -1;
|
|
|
|
if (perf_evsel__test_field(evsel, "pid", 4, true))
|
|
ret = -1;
|
|
|
|
if (perf_evsel__test_field(evsel, "prio", 4, true))
|
|
ret = -1;
|
|
|
|
if (perf_evsel__test_field(evsel, "target_cpu", 4, true))
|
|
ret = -1;
|
|
|
|
return ret;
|
|
}
|