mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-22 13:54:57 +08:00
30df88a80f
The test case "perf test 'Setup struct perf_event_attr'" is failing.
On s390 this output is observed:
# ./perf test -Fvvvv 17
17: Setup struct perf_event_attr :
--- start ---
running './tests/attr/test-stat-C0'
Using CPUID IBM,8561,703,T01,3.6,002f
.....
Event event:base-stat
fd = 1
group_fd = -1
flags = 0|8
cpu = *
type = 0
size = 128 <<<--- wrong, specified in file base-stat
config = 0
sample_period = 0
sample_type = 65536
...
'PERF_TEST_ATTR=/tmp/tmpgw574wvg ./perf stat -o \
/tmp/tmpgw574wvg/perf.data -e cycles -C 0 kill >/dev/null \
2>&1 ret '1', expected '1'
loading result events
Event event-0-0-4
fd = 4
group_fd = -1
cpu = 0
pid = -1
flags = 8
type = 0
size = 136 <<<--- actual size used in system call
.....
compare
matching [event-0-0-4]
to [event:base-stat]
[cpu] 0 *
[flags] 8 0|8
[type] 0 0
[size] 136 128
->FAIL
match: [event-0-0-4] matches []
expected size=136, got 128
FAILED './tests/attr/test-stat-C0' - match failure
This mismatch is caused by
commit 09519ec3b1 ("perf: Add perf_event_attr::config3")
which enlarges the structure perf_event_attr by 8 bytes.
Fix this by adjusting the expected value of size.
Output after:
# ./perf test -Fvvvv 17
17: Setup struct perf_event_attr :
--- start ---
running './tests/attr/test-stat-C0'
Using CPUID IBM,8561,703,T01,3.6,002f
...
matched
compare
matching [event-0-0-4]
to [event:base-stat]
[cpu] 0 *
[flags] 8 0|8
[type] 0 0
[size] 136 136
....
->OK
match: [event-0-0-4] matches ['event:base-stat']
matched
Fixes: 09519ec3b1 ("perf: Add perf_event_attr::config3")
Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20230322094731.1768281-1-tmricht@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
42 lines
570 B
Plaintext
42 lines
570 B
Plaintext
[event]
|
|
fd=1
|
|
group_fd=-1
|
|
# 0 or PERF_FLAG_FD_CLOEXEC flag
|
|
flags=0|8
|
|
cpu=*
|
|
type=0|1
|
|
size=136
|
|
config=0
|
|
sample_period=*
|
|
sample_type=263
|
|
read_format=0|4|20
|
|
disabled=1
|
|
inherit=1
|
|
pinned=0
|
|
exclusive=0
|
|
exclude_user=0
|
|
exclude_kernel=0|1
|
|
exclude_hv=0|1
|
|
exclude_idle=0
|
|
mmap=1
|
|
comm=1
|
|
freq=1
|
|
inherit_stat=0
|
|
enable_on_exec=1
|
|
task=1
|
|
watermark=0
|
|
precise_ip=0|1|2|3
|
|
mmap_data=0
|
|
sample_id_all=1
|
|
exclude_host=0|1
|
|
exclude_guest=0|1
|
|
exclude_callchain_kernel=0
|
|
exclude_callchain_user=0
|
|
wakeup_events=0
|
|
bp_type=0
|
|
config1=0
|
|
config2=0
|
|
branch_sample_type=0
|
|
sample_regs_user=0
|
|
sample_stack_user=0
|