mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-07-01 23:53:16 -04:00
Enabled when REFCNT_CHECKING is defined. The change adds a memory allocated pointer that is interposed between the reference counted cpu map at a get and freed by a put. The pointer replaces the original perf_cpu_map struct, so use of the perf_cpu_map via APIs remains unchanged. Any use of the cpu map without the API requires two versions, handled via the RC_CHK_ACCESS macro. This change is intended to catch: - use after put: using a cpumap after you have put it will cause a segv. - unbalanced puts: two puts for a get will result in a double free that can be captured and reported by tools like address sanitizer, including with the associated stack traces of allocation and frees. - missing puts: if a put is missing then the get turns into a memory leak that can be reported by leak sanitizer, including the stack trace at the point the get occurs. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Darren Hart <dvhart@infradead.org> Cc: Davidlohr Bueso <dave@stgolabs.net> Cc: Dmitriy Vyukov <dvyukov@google.com> Cc: Eric Dumazet <edumazet@google.com> Cc: German Gomez <german.gomez@arm.com> Cc: Hao Luo <haoluo@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.g.garry@oracle.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Madhavan Srinivasan <maddy@linux.ibm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Miaoqian Lin <linmq006@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Riccardo Mancini <rickyman7@gmail.com> Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com> Cc: Song Liu <song@kernel.org> Cc: Stephen Brennan <stephen.s.brennan@oracle.com> Cc: Steven Rostedt (VMware) <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Thomas Richter <tmricht@linux.ibm.com>, Cc: Yury Norov <yury.norov@gmail.com> Link: https://lore.kernel.org/lkml/20230407230405.2931830-3-irogers@google.com [ Extracted from a larger patch ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
404 lines
8.9 KiB
C
404 lines
8.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
#include <perf/cpumap.h>
|
|
#include <stdlib.h>
|
|
#include <linux/refcount.h>
|
|
#include <internal/cpumap.h>
|
|
#include <asm/bug.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <ctype.h>
|
|
#include <limits.h>
|
|
|
|
void perf_cpu_map__set_nr(struct perf_cpu_map *map, int nr_cpus)
|
|
{
|
|
RC_CHK_ACCESS(map)->nr = nr_cpus;
|
|
}
|
|
|
|
struct perf_cpu_map *perf_cpu_map__alloc(int nr_cpus)
|
|
{
|
|
RC_STRUCT(perf_cpu_map) *cpus = malloc(sizeof(*cpus) + sizeof(struct perf_cpu) * nr_cpus);
|
|
struct perf_cpu_map *result;
|
|
|
|
if (ADD_RC_CHK(result, cpus)) {
|
|
cpus->nr = nr_cpus;
|
|
refcount_set(&cpus->refcnt, 1);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
struct perf_cpu_map *perf_cpu_map__dummy_new(void)
|
|
{
|
|
struct perf_cpu_map *cpus = perf_cpu_map__alloc(1);
|
|
|
|
if (cpus)
|
|
RC_CHK_ACCESS(cpus)->map[0].cpu = -1;
|
|
|
|
return cpus;
|
|
}
|
|
|
|
static void cpu_map__delete(struct perf_cpu_map *map)
|
|
{
|
|
if (map) {
|
|
WARN_ONCE(refcount_read(perf_cpu_map__refcnt(map)) != 0,
|
|
"cpu_map refcnt unbalanced\n");
|
|
RC_CHK_FREE(map);
|
|
}
|
|
}
|
|
|
|
struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map)
|
|
{
|
|
struct perf_cpu_map *result;
|
|
|
|
if (RC_CHK_GET(result, map))
|
|
refcount_inc(perf_cpu_map__refcnt(map));
|
|
|
|
return result;
|
|
}
|
|
|
|
void perf_cpu_map__put(struct perf_cpu_map *map)
|
|
{
|
|
if (map) {
|
|
if (refcount_dec_and_test(perf_cpu_map__refcnt(map)))
|
|
cpu_map__delete(map);
|
|
else
|
|
RC_CHK_PUT(map);
|
|
}
|
|
}
|
|
|
|
static struct perf_cpu_map *cpu_map__default_new(void)
|
|
{
|
|
struct perf_cpu_map *cpus;
|
|
int nr_cpus;
|
|
|
|
nr_cpus = sysconf(_SC_NPROCESSORS_ONLN);
|
|
if (nr_cpus < 0)
|
|
return NULL;
|
|
|
|
cpus = perf_cpu_map__alloc(nr_cpus);
|
|
if (cpus != NULL) {
|
|
int i;
|
|
|
|
for (i = 0; i < nr_cpus; ++i)
|
|
RC_CHK_ACCESS(cpus)->map[i].cpu = i;
|
|
}
|
|
|
|
return cpus;
|
|
}
|
|
|
|
struct perf_cpu_map *perf_cpu_map__default_new(void)
|
|
{
|
|
return cpu_map__default_new();
|
|
}
|
|
|
|
|
|
static int cmp_cpu(const void *a, const void *b)
|
|
{
|
|
const struct perf_cpu *cpu_a = a, *cpu_b = b;
|
|
|
|
return cpu_a->cpu - cpu_b->cpu;
|
|
}
|
|
|
|
static struct perf_cpu_map *cpu_map__trim_new(int nr_cpus, const struct perf_cpu *tmp_cpus)
|
|
{
|
|
size_t payload_size = nr_cpus * sizeof(struct perf_cpu);
|
|
struct perf_cpu_map *cpus = perf_cpu_map__alloc(nr_cpus);
|
|
int i, j;
|
|
|
|
if (cpus != NULL) {
|
|
memcpy(RC_CHK_ACCESS(cpus)->map, tmp_cpus, payload_size);
|
|
qsort(RC_CHK_ACCESS(cpus)->map, nr_cpus, sizeof(struct perf_cpu), cmp_cpu);
|
|
/* Remove dups */
|
|
j = 0;
|
|
for (i = 0; i < nr_cpus; i++) {
|
|
if (i == 0 || RC_CHK_ACCESS(cpus)->map[i].cpu != RC_CHK_ACCESS(cpus)->map[i - 1].cpu)
|
|
RC_CHK_ACCESS(cpus)->map[j++].cpu = RC_CHK_ACCESS(cpus)->map[i].cpu;
|
|
}
|
|
perf_cpu_map__set_nr(cpus, j);
|
|
assert(j <= nr_cpus);
|
|
}
|
|
return cpus;
|
|
}
|
|
|
|
struct perf_cpu_map *perf_cpu_map__read(FILE *file)
|
|
{
|
|
struct perf_cpu_map *cpus = NULL;
|
|
int nr_cpus = 0;
|
|
struct perf_cpu *tmp_cpus = NULL, *tmp;
|
|
int max_entries = 0;
|
|
int n, cpu, prev;
|
|
char sep;
|
|
|
|
sep = 0;
|
|
prev = -1;
|
|
for (;;) {
|
|
n = fscanf(file, "%u%c", &cpu, &sep);
|
|
if (n <= 0)
|
|
break;
|
|
if (prev >= 0) {
|
|
int new_max = nr_cpus + cpu - prev - 1;
|
|
|
|
WARN_ONCE(new_max >= MAX_NR_CPUS, "Perf can support %d CPUs. "
|
|
"Consider raising MAX_NR_CPUS\n", MAX_NR_CPUS);
|
|
|
|
if (new_max >= max_entries) {
|
|
max_entries = new_max + MAX_NR_CPUS / 2;
|
|
tmp = realloc(tmp_cpus, max_entries * sizeof(struct perf_cpu));
|
|
if (tmp == NULL)
|
|
goto out_free_tmp;
|
|
tmp_cpus = tmp;
|
|
}
|
|
|
|
while (++prev < cpu)
|
|
tmp_cpus[nr_cpus++].cpu = prev;
|
|
}
|
|
if (nr_cpus == max_entries) {
|
|
max_entries += MAX_NR_CPUS;
|
|
tmp = realloc(tmp_cpus, max_entries * sizeof(struct perf_cpu));
|
|
if (tmp == NULL)
|
|
goto out_free_tmp;
|
|
tmp_cpus = tmp;
|
|
}
|
|
|
|
tmp_cpus[nr_cpus++].cpu = cpu;
|
|
if (n == 2 && sep == '-')
|
|
prev = cpu;
|
|
else
|
|
prev = -1;
|
|
if (n == 1 || sep == '\n')
|
|
break;
|
|
}
|
|
|
|
if (nr_cpus > 0)
|
|
cpus = cpu_map__trim_new(nr_cpus, tmp_cpus);
|
|
else
|
|
cpus = cpu_map__default_new();
|
|
out_free_tmp:
|
|
free(tmp_cpus);
|
|
return cpus;
|
|
}
|
|
|
|
static struct perf_cpu_map *cpu_map__read_all_cpu_map(void)
|
|
{
|
|
struct perf_cpu_map *cpus = NULL;
|
|
FILE *onlnf;
|
|
|
|
onlnf = fopen("/sys/devices/system/cpu/online", "r");
|
|
if (!onlnf)
|
|
return cpu_map__default_new();
|
|
|
|
cpus = perf_cpu_map__read(onlnf);
|
|
fclose(onlnf);
|
|
return cpus;
|
|
}
|
|
|
|
struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list)
|
|
{
|
|
struct perf_cpu_map *cpus = NULL;
|
|
unsigned long start_cpu, end_cpu = 0;
|
|
char *p = NULL;
|
|
int i, nr_cpus = 0;
|
|
struct perf_cpu *tmp_cpus = NULL, *tmp;
|
|
int max_entries = 0;
|
|
|
|
if (!cpu_list)
|
|
return cpu_map__read_all_cpu_map();
|
|
|
|
/*
|
|
* must handle the case of empty cpumap to cover
|
|
* TOPOLOGY header for NUMA nodes with no CPU
|
|
* ( e.g., because of CPU hotplug)
|
|
*/
|
|
if (!isdigit(*cpu_list) && *cpu_list != '\0')
|
|
goto out;
|
|
|
|
while (isdigit(*cpu_list)) {
|
|
p = NULL;
|
|
start_cpu = strtoul(cpu_list, &p, 0);
|
|
if (start_cpu >= INT_MAX
|
|
|| (*p != '\0' && *p != ',' && *p != '-'))
|
|
goto invalid;
|
|
|
|
if (*p == '-') {
|
|
cpu_list = ++p;
|
|
p = NULL;
|
|
end_cpu = strtoul(cpu_list, &p, 0);
|
|
|
|
if (end_cpu >= INT_MAX || (*p != '\0' && *p != ','))
|
|
goto invalid;
|
|
|
|
if (end_cpu < start_cpu)
|
|
goto invalid;
|
|
} else {
|
|
end_cpu = start_cpu;
|
|
}
|
|
|
|
WARN_ONCE(end_cpu >= MAX_NR_CPUS, "Perf can support %d CPUs. "
|
|
"Consider raising MAX_NR_CPUS\n", MAX_NR_CPUS);
|
|
|
|
for (; start_cpu <= end_cpu; start_cpu++) {
|
|
/* check for duplicates */
|
|
for (i = 0; i < nr_cpus; i++)
|
|
if (tmp_cpus[i].cpu == (int)start_cpu)
|
|
goto invalid;
|
|
|
|
if (nr_cpus == max_entries) {
|
|
max_entries += MAX_NR_CPUS;
|
|
tmp = realloc(tmp_cpus, max_entries * sizeof(struct perf_cpu));
|
|
if (tmp == NULL)
|
|
goto invalid;
|
|
tmp_cpus = tmp;
|
|
}
|
|
tmp_cpus[nr_cpus++].cpu = (int)start_cpu;
|
|
}
|
|
if (*p)
|
|
++p;
|
|
|
|
cpu_list = p;
|
|
}
|
|
|
|
if (nr_cpus > 0)
|
|
cpus = cpu_map__trim_new(nr_cpus, tmp_cpus);
|
|
else if (*cpu_list != '\0')
|
|
cpus = cpu_map__default_new();
|
|
else
|
|
cpus = perf_cpu_map__dummy_new();
|
|
invalid:
|
|
free(tmp_cpus);
|
|
out:
|
|
return cpus;
|
|
}
|
|
|
|
struct perf_cpu perf_cpu_map__cpu(const struct perf_cpu_map *cpus, int idx)
|
|
{
|
|
struct perf_cpu result = {
|
|
.cpu = -1
|
|
};
|
|
|
|
if (cpus && idx < RC_CHK_ACCESS(cpus)->nr)
|
|
return RC_CHK_ACCESS(cpus)->map[idx];
|
|
|
|
return result;
|
|
}
|
|
|
|
int perf_cpu_map__nr(const struct perf_cpu_map *cpus)
|
|
{
|
|
return cpus ? RC_CHK_ACCESS(cpus)->nr : 1;
|
|
}
|
|
|
|
bool perf_cpu_map__empty(const struct perf_cpu_map *map)
|
|
{
|
|
return map ? RC_CHK_ACCESS(map)->map[0].cpu == -1 : true;
|
|
}
|
|
|
|
int perf_cpu_map__idx(const struct perf_cpu_map *cpus, struct perf_cpu cpu)
|
|
{
|
|
int low, high;
|
|
|
|
if (!cpus)
|
|
return -1;
|
|
|
|
low = 0;
|
|
high = RC_CHK_ACCESS(cpus)->nr;
|
|
while (low < high) {
|
|
int idx = (low + high) / 2;
|
|
struct perf_cpu cpu_at_idx = RC_CHK_ACCESS(cpus)->map[idx];
|
|
|
|
if (cpu_at_idx.cpu == cpu.cpu)
|
|
return idx;
|
|
|
|
if (cpu_at_idx.cpu > cpu.cpu)
|
|
high = idx;
|
|
else
|
|
low = idx + 1;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
bool perf_cpu_map__has(const struct perf_cpu_map *cpus, struct perf_cpu cpu)
|
|
{
|
|
return perf_cpu_map__idx(cpus, cpu) != -1;
|
|
}
|
|
|
|
struct perf_cpu perf_cpu_map__max(const struct perf_cpu_map *map)
|
|
{
|
|
struct perf_cpu result = {
|
|
.cpu = -1
|
|
};
|
|
|
|
// cpu_map__trim_new() qsort()s it, cpu_map__default_new() sorts it as well.
|
|
return RC_CHK_ACCESS(map)->nr > 0 ? RC_CHK_ACCESS(map)->map[RC_CHK_ACCESS(map)->nr - 1] : result;
|
|
}
|
|
|
|
/** Is 'b' a subset of 'a'. */
|
|
bool perf_cpu_map__is_subset(const struct perf_cpu_map *a, const struct perf_cpu_map *b)
|
|
{
|
|
if (a == b || !b)
|
|
return true;
|
|
if (!a || RC_CHK_ACCESS(b)->nr > RC_CHK_ACCESS(a)->nr)
|
|
return false;
|
|
|
|
for (int i = 0, j = 0; i < RC_CHK_ACCESS(a)->nr; i++) {
|
|
if (RC_CHK_ACCESS(a)->map[i].cpu > RC_CHK_ACCESS(b)->map[j].cpu)
|
|
return false;
|
|
if (RC_CHK_ACCESS(a)->map[i].cpu == RC_CHK_ACCESS(b)->map[j].cpu) {
|
|
j++;
|
|
if (j == RC_CHK_ACCESS(b)->nr)
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* Merge two cpumaps
|
|
*
|
|
* orig either gets freed and replaced with a new map, or reused
|
|
* with no reference count change (similar to "realloc")
|
|
* other has its reference count increased.
|
|
*/
|
|
|
|
struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig,
|
|
struct perf_cpu_map *other)
|
|
{
|
|
struct perf_cpu *tmp_cpus;
|
|
int tmp_len;
|
|
int i, j, k;
|
|
struct perf_cpu_map *merged;
|
|
|
|
if (perf_cpu_map__is_subset(orig, other))
|
|
return orig;
|
|
if (perf_cpu_map__is_subset(other, orig)) {
|
|
perf_cpu_map__put(orig);
|
|
return perf_cpu_map__get(other);
|
|
}
|
|
|
|
tmp_len = RC_CHK_ACCESS(orig)->nr + RC_CHK_ACCESS(other)->nr;
|
|
tmp_cpus = malloc(tmp_len * sizeof(struct perf_cpu));
|
|
if (!tmp_cpus)
|
|
return NULL;
|
|
|
|
/* Standard merge algorithm from wikipedia */
|
|
i = j = k = 0;
|
|
while (i < RC_CHK_ACCESS(orig)->nr && j < RC_CHK_ACCESS(other)->nr) {
|
|
if (RC_CHK_ACCESS(orig)->map[i].cpu <= RC_CHK_ACCESS(other)->map[j].cpu) {
|
|
if (RC_CHK_ACCESS(orig)->map[i].cpu == RC_CHK_ACCESS(other)->map[j].cpu)
|
|
j++;
|
|
tmp_cpus[k++] = RC_CHK_ACCESS(orig)->map[i++];
|
|
} else
|
|
tmp_cpus[k++] = RC_CHK_ACCESS(other)->map[j++];
|
|
}
|
|
|
|
while (i < RC_CHK_ACCESS(orig)->nr)
|
|
tmp_cpus[k++] = RC_CHK_ACCESS(orig)->map[i++];
|
|
|
|
while (j < RC_CHK_ACCESS(other)->nr)
|
|
tmp_cpus[k++] = RC_CHK_ACCESS(other)->map[j++];
|
|
assert(k <= tmp_len);
|
|
|
|
merged = cpu_map__trim_new(k, tmp_cpus);
|
|
free(tmp_cpus);
|
|
perf_cpu_map__put(orig);
|
|
return merged;
|
|
}
|