The following commit has been merged into the perf/core branch of tip: Commit-ID: 1ea770f6c1971bc101b3741f4d88b0b4ea5c4181 Gitweb: https://git.kernel.org/tip/1ea770f6c1971bc101b3741f4d88b0b4ea5c4181 Author: Ravi Bangoria <ravi.bangoria@xxxxxxxxxxxxx> AuthorDate: Thu, 22 Aug 2019 14:20:45 +05:30 Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> CommitterDate: Thu, 22 Aug 2019 17:16:57 -03:00 perf c2c: Fix report with offline cpus If c2c is recorded on a machine where any cpus are offline, 'perf c2c report' throws an error "node/cpu topology bugFailed setup nodes". It fails because while preparing node-cpu mapping we don't consider offline cpus. Reported-by: Nageswara R Sastry <nasastry@xxxxxxxxxx> Signed-off-by: Ravi Bangoria <ravi.bangoria@xxxxxxxxxxxxx> Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx> Fixes: 1e181b92a2da ("perf c2c report: Add 'node' sort key") Link: http://lkml.kernel.org/r/20190822085045.25108-1-ravi.bangoria@xxxxxxxxxxxxx Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> --- tools/perf/builtin-c2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index 01629f5..2111437 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -2027,7 +2027,7 @@ static int setup_nodes(struct perf_session *session) c2c.node_info = 2; c2c.nodes_cnt = session->header.env.nr_numa_nodes; - c2c.cpus_cnt = session->header.env.nr_cpus_online; + c2c.cpus_cnt = session->header.env.nr_cpus_avail; n = session->header.env.numa_nodes; if (!n)