Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf test: Remove 'core_id' check in topo test

The topology test case of 'perf test' seems to be broken on my x86
system - due to the comparison of a "core-id" with # of CPUs online.

There are 8 online CPUs:

$ cat /sys/devices/system/cpu/online
0-7

but core-ids are not sequential and some core-ids exceed the number
of online CPUs.

$ cat /sys/devices/system/cpu/cpu?/topology/core_id
0
1
9
10
0
1
9
10

Looks like we can safely remove the check. Output before:

$ perf --version
perf version 4.4.rc1.g34258a

$ perf test -v topo
36: Test topology in session :
--- start ---
test child forked, pid 5906
templ file: /tmp/perf-test-vCwWG3
core_id number is too big.You may need to upgrade the perf tool.
test child interrupted
---- end ----
Test topology in session: FAILED!

and after:

$ perf test -v topo
36: Test topology in session :
--- start ---
test child forked, pid 6532
templ file: /tmp/perf-test-y10wFJ
CPU 0, core 0, socket 0
CPU 1, core 1, socket 0
CPU 2, core 9, socket 0
CPU 3, core 10, socket 0
CPU 4, core 0, socket 1
CPU 5, core 1, socket 1
CPU 6, core 9, socket 1
CPU 7, core 10, socket 1
test child finished with 0
---- end ----
Test topology in session: Ok

Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Jan Stancek <jstancek@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Link: http://lkml.kernel.org/r/20151203233219.GA27696@us.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Sukadev Bhattiprolu and committed by
Arnaldo Carvalho de Melo
4c9d6c18 ced30bc9

-5
-5
tools/perf/util/header.c
··· 1872 1872 if (ph->needs_swap) 1873 1873 nr = bswap_32(nr); 1874 1874 1875 - if (nr > (u32)cpu_nr) { 1876 - pr_debug("core_id number is too big." 1877 - "You may need to upgrade the perf tool.\n"); 1878 - goto free_cpu; 1879 - } 1880 1875 ph->env.cpu[i].core_id = nr; 1881 1876 1882 1877 ret = readn(fd, &nr, sizeof(nr));