[PATCH v3 1/2] perf bench numa: fix cpumask memory leak in node_has_cpus()

From: Alexander Gordeev
Date: Thu Aug 13 2020 - 07:31:03 EST


Couple numa_allocate_cpumask() and numa_free_cpumask() functions

Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxxxxx>
---
tools/perf/bench/numa.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c
index 31e2601..9066511 100644
--- a/tools/perf/bench/numa.c
+++ b/tools/perf/bench/numa.c
@@ -248,16 +248,21 @@ static int is_node_present(int node)
static bool node_has_cpus(int node)
{
struct bitmask *cpu = numa_allocate_cpumask();
+ bool ret = false; /* fall back to nocpus */
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++) {
- if (numa_bitmask_isbitset(cpu, i))
- return true;
+ if (numa_bitmask_isbitset(cpu, i)) {
+ 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)
--
1.8.3.1