Commit 1d90a685 authored by Petr Holasek's avatar Petr Holasek Committed by Arnaldo Carvalho de Melo

perf bench numa: Fix immediate meeting of convergence condition

This patch fixes the race in the beginning of benchmark run when some
threads hasn't got assigned curr_cpu yet so they don't occur in
nodes-of-process stats and benchmark concludes that all remaining
threads are converged already.

The race can be reproduced with small amount of threads and some bigger
amount of shared process memory, e.g. one process, two threads and 5GB
of process memory.
Signed-off-by: default avatarPetr Holasek <pholasek@redhat.com>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1429198699-25039-4-git-send-email-pholasek@redhat.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 24f1ced1
...@@ -828,6 +828,9 @@ static int count_process_nodes(int process_nr) ...@@ -828,6 +828,9 @@ static int count_process_nodes(int process_nr)
td = g->threads + task_nr; td = g->threads + task_nr;
node = numa_node_of_cpu(td->curr_cpu); node = numa_node_of_cpu(td->curr_cpu);
if (node < 0) /* curr_cpu was likely still -1 */
return 0;
node_present[node] = 1; node_present[node] = 1;
} }
...@@ -882,6 +885,11 @@ static void calc_convergence_compression(int *strong) ...@@ -882,6 +885,11 @@ static void calc_convergence_compression(int *strong)
for (p = 0; p < g->p.nr_proc; p++) { for (p = 0; p < g->p.nr_proc; p++) {
unsigned int nodes = count_process_nodes(p); unsigned int nodes = count_process_nodes(p);
if (!nodes) {
*strong = 0;
return;
}
nodes_min = min(nodes, nodes_min); nodes_min = min(nodes, nodes_min);
nodes_max = max(nodes, nodes_max); nodes_max = max(nodes, nodes_max);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment