perf test session topology: Fix data path
PATCH 1/1 perf test session topology: Fix data path
Commit 2d4f27999b88 ("perf data: Add global path holder") missed path conversion in tests/topology.c, causing the "Session topology" testcase to "hang" (waits forever for input from stdin) when doing "ssh $VM perf test".
Can be reproduced by running "cat | perf test topo", and crashed by replacing cat with true:
$ true | perf test -v topo 40: Session topology : --- start --- test child forked, pid 3638 templ file: /tmp/perf-test-QPvAch incompatible file format incompatible file format (rerun with -v to learn more) free(): invalid pointer test child interrupted ---- end ---- Session topology: FAILED!
--- tools/perf/tests/topology.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
tools/perf/tests/topology.c +4 -8
@@ -33,10 +33,8 @@ static int session_write_header(char *path) {struct perf_session *session;struct perf_data data = { - .file = { - .path = path, - }, - .mode =PERF_DATA_MODE_WRITE , + .path = path, + .mode =PERF_DATA_MODE_WRITE , }; session =perf_session__new (&data, false,NULL );
@@ -63,10 +61,8 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) {struct perf_session *session;struct perf_data data = { - .file = { - .path = path, - }, - .mode =PERF_DATA_MODE_READ , + .path = path, + .mode =PERF_DATA_MODE_READ , };int i;
Signature · 1 line
2.25.3
Quoted 20 lines · Tommi Rantala
Commit
2d4f27999b88("perf data: Add global path holder") missed path conversion intests/topology.c, causing the "Session topology" testcase to "hang" (waits forever for input from stdin) when doing "ssh $VM perf test".Can be reproduced by running "cat | perf test topo", and crashed by replacing cat with true:
$ true | perf test -v topo 40: Session topology : --- start --- test child forked, pid 3638 templ file: /tmp/perf-test-QPvAch incompatible file format incompatible file format (rerun with -v to learn more) free(): invalid pointer test child interrupted ---- end ---- Session topology: FAILED!
Quoted 2 lines
Fixes 2d4f27999b88 ("perf data: Add global path holder")Signed-off-by Tommi Rantala <[email protected]>
thanks,
jirka
Quoted 37 lines
--- tools/perf/tests/topology.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)tools/perf/tests/topology.c +4
-8@@ -33,10 +33,8 @@ static int session_write_header(char *path) {struct perf_session *session;struct perf_data data = { - .file = { - .path = path, - }, - .mode =PERF_DATA_MODE_WRITE , + .path = path, + .mode =PERF_DATA_MODE_WRITE , }; session =perf_session__new (&data, false,NULL );@@ -63,10 +61,8 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) {struct perf_session *session;struct perf_data data = { - .file = { - .path = path, - }, - .mode =PERF_DATA_MODE_READ , + .path = path, + .mode =PERF_DATA_MODE_READ , };int i;Signature · 1 line
2.25.3
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: dbd660e6b2884b864d2642d930a163d3bcebe4be Gitweb: https://git.kernel.org/tip/dbd660e6b2884b864d2642d930a163d3bcebe4be Author: Tommi Rantala <[email protected]> AuthorDate: Thu, 23 Apr 2020 14:53:40 +03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Thu, 23 Apr 2020 11:08:24 -03:00
perf test session topology: Fix data path
Commit 2d4f27999b88 ("perf data: Add global path holder") missed path conversion in tests/topology.c, causing the "Session topology" testcase to "hang" (waits forever for input from stdin) when doing "ssh $VM perf test".
Can be reproduced by running "cat | perf test topo", and crashed by replacing cat with true:
$ true | perf test -v topo 40: Session topology : --- start --- test child forked, pid 3638 templ file: /tmp/perf-test-QPvAch incompatible file format incompatible file format (rerun with -v to learn more) free(): invalid pointer test child interrupted ---- end ---- Session topology: FAILED!
Committer testing:
Reproduced the above result before the patch and after it is back working:
# true | perf test -v topo 41: Session topology : --- start --- test child forked, pid 19374 templ file: /tmp/perf-test-YOTEQg CPU 0, core 0, socket 0 CPU 1, core 1, socket 0 CPU 2, core 2, socket 0 CPU 3, core 3, socket 0 CPU 4, core 0, socket 0 CPU 5, core 1, socket 0 CPU 6, core 2, socket 0 CPU 7, core 3, socket 0 test child finished with 0 ---- end ---- Session topology: Ok #
--- tools/perf/tests/topology.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
tools/perf/tests/topology.c +4 -8
@@ -33,10 +33,8 @@ static int session_write_header(char *path) {struct perf_session *session;struct perf_data data = { - .file = { - .path = path, - }, - .mode =PERF_DATA_MODE_WRITE , + .path = path, + .mode =PERF_DATA_MODE_WRITE , }; session =perf_session__new (&data, false,NULL );
@@ -63,10 +61,8 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) {struct perf_session *session;struct perf_data data = { - .file = { - .path = path, - }, - .mode =PERF_DATA_MODE_READ , + .path = path, + .mode =PERF_DATA_MODE_READ , };int i;