Commit 02241b9c authored Mar 05, 2019 by Jiri Olsa Committed by Greg Kroah-Hartman Apr 05, 2019

perf c2c: Fix c2c report for empty numa node



[ Upstream commit e34c940245437f36d2c492edd1f8237eff391064 ]

Ravi Bangoria reported that we fail with an empty NUMA node with the
following message:

  $ lscpu
  NUMA node0 CPU(s):
  NUMA node1 CPU(s):   0-4

  $ sudo ./perf c2c report
  node/cpu topology bugFailed setup nodes

Fix this by detecting the empty node and keeping its CPU set empty.

Reported-by: Nageswara R Sastry <nasastry@in.ibm.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190305152536.21035-2-jolsa@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent a5c4c090

tools/perf/builtin-c2c.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1935,6 +1935,12 @@ static int setup_nodes(struct perf_session *session)
		if (!set)
		return -ENOMEM;

		nodes[node] = set;

		/* empty node, skip */
		if (cpu_map__empty(map))
		continue;

		for (cpu = 0; cpu < map->nr; cpu++) {
		set_bit(map->map[cpu], set);

		@@ -1943,8 +1949,6 @@ static int setup_nodes(struct perf_session *session)

		cpu2node[map->map[cpu]] = node;
		}

		nodes[node] = set;
		}

		setup_nodes_header();