Commit 509f68e3 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Arnaldo Carvalho de Melo

perf bench numa: Fix cpumask memory leak in node_has_cpus()

Couple numa_allocate_cpumask() and numa_free_cpumask() functions
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Reviewed-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Balamuruhan S <bala24@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com>
Link: http://lore.kernel.org/lkml/20200813113041.GA1685@oc3871087118.ibm.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fa5c8931
...@@ -248,16 +248,21 @@ static int is_node_present(int node) ...@@ -248,16 +248,21 @@ static int is_node_present(int node)
static bool node_has_cpus(int node) static bool node_has_cpus(int node)
{ {
struct bitmask *cpu = numa_allocate_cpumask(); struct bitmask *cpu = numa_allocate_cpumask();
bool ret = false; /* fall back to nocpus */
unsigned int i; unsigned int i;
if (cpu && !numa_node_to_cpus(node, cpu)) { BUG_ON(!cpu);
if (!numa_node_to_cpus(node, cpu)) {
for (i = 0; i < cpu->size; i++) { for (i = 0; i < cpu->size; i++) {
if (numa_bitmask_isbitset(cpu, i)) if (numa_bitmask_isbitset(cpu, i)) {
return true; ret = true;
break;
}
} }
} }
numa_free_cpumask(cpu);
return false; /* lets fall back to nocpus safely */ return ret;
} }
static cpu_set_t bind_to_cpu(int target_cpu) static cpu_set_t bind_to_cpu(int target_cpu)
......
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