OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf record: Support s390 random socket_id assignment

Browse Source 
On s390 the socket identifier assigned to a CPU identifier is random and
(depending on the configuration of the LPAR) may be higher than the CPU
identifier. This is currently not supported.

Fix this by allowing arbitrary socket identifiers being assigned to
CPU id.

Output before:

  [root@p23lp27 perf]# ./perf report --header -I -v
  ...
  socket_id number is too big.You may need to upgrade the perf tool.
  Error:
  The perf.data file has no samples!
  # ========
  # captured on    : Tue May 29 09:29:57 2018
  # header version : 1
  ...
  # Core ID and Socket ID information is not available
  ...
  [root@p23lp27 perf]#

Output after:

  [root@p23lp27 perf]# ./perf report --header -I -v
  ...
  Error:
  The perf.data file has no samples!
  # ========
  # captured on    : Tue May 29 09:29:57 2018
  # header version : 1
  ...
  # CPU 0: Core ID 0, Socket ID 6
  # CPU 1: Core ID 1, Socket ID 3
  # CPU 2: Core ID -1, Socket ID -1
  ...
  [root@p23lp27 perf]#

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Link: http://lkml.kernel.org/r/20180611073153.15592-1-tmricht@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Thomas Richter 2018-06-11 09:31:52 +02:00 committed by Arnaldo Carvalho de Melo
parent 57d6a7938a
commit 0176622953
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/perf/util/header.c
View File

@ -2129,6 +2129,7 @@ static int process_cpu_topology(struct feat_fd *ff, void *data __maybe_unused)
int cpu_nr = ff->ph->env.nr_cpus_avail; int cpu_nr = ff->ph->env.nr_cpus_avail;
u64 size = 0; u64 size = 0;
struct perf_header *ph = ff->ph; struct perf_header *ph = ff->ph;
bool do_core_id_test = true;
ph->env.cpu = calloc(cpu_nr, sizeof(*ph->env.cpu)); ph->env.cpu = calloc(cpu_nr, sizeof(*ph->env.cpu));
if (!ph->env.cpu) if (!ph->env.cpu)
@ -2183,6 +2184,13 @@ static int process_cpu_topology(struct feat_fd *ff, void *data __maybe_unused)
return 0; return 0;
} }
/* On s390 the socket_id number is not related to the numbers of cpus.
* The socket_id number might be higher than the numbers of cpus.
* This depends on the configuration.
*/
if (ph->env.arch && !strncmp(ph->env.arch, "s390", 4))
do_core_id_test = false;
for (i = 0; i < (u32)cpu_nr; i++) { for (i = 0; i < (u32)cpu_nr; i++) {
if (do_read_u32(ff, &nr)) if (do_read_u32(ff, &nr))
goto free_cpu; goto free_cpu;
@ -2192,7 +2200,7 @@ static int process_cpu_topology(struct feat_fd *ff, void *data __maybe_unused)
if (do_read_u32(ff, &nr)) if (do_read_u32(ff, &nr))
goto free_cpu; goto free_cpu;
if (nr != (u32)-1 && nr > (u32)cpu_nr) { if (do_core_id_test && nr != (u32)-1 && nr > (u32)cpu_nr) {
pr_debug("socket_id number is too big." pr_debug("socket_id number is too big."
"You may need to upgrade the perf tool.\n"); "You may need to upgrade the perf tool.\n");
goto free_cpu; goto free_cpu;