mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 06:02:05 +00:00
6d18804b96
A common problem is confusing CPU map indices with the CPU, by wrapping the CPU with a struct then this is avoided. This approach is similar to atomic_t. Committer notes: To make it build with BUILD_BPF_SKEL=1 these files needed the conversions to 'struct perf_cpu' usage: tools/perf/util/bpf_counter.c tools/perf/util/bpf_counter_cgroup.c tools/perf/util/bpf_ftrace.c Also perf_env__get_cpu() was removed back in "perf cpumap: Switch cpu_map__build_map to cpu function". Additionally these needed to be fixed for the ARM builds to complete: tools/perf/arch/arm/util/cs-etm.c tools/perf/arch/arm64/util/pmu.c Suggested-by: John Garry <john.garry@huawei.com> Signed-off-by: Ian Rogers <irogers@google.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Clarke <pc@us.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Riccardo Mancini <rickyman7@gmail.com> Cc: Stephane Eranian <eranian@google.com> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Vineet Singh <vineet.singh@intel.com> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Cc: zhengjun.xing@intel.com Link: https://lore.kernel.org/r/20220105061351.120843-49-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
144 lines
4.2 KiB
C
144 lines
4.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include "tests.h"
|
|
#include <stdio.h>
|
|
#include "cpumap.h"
|
|
#include "event.h"
|
|
#include "util/synthetic-events.h"
|
|
#include <string.h>
|
|
#include <linux/bitops.h>
|
|
#include <perf/cpumap.h>
|
|
#include "debug.h"
|
|
|
|
struct machine;
|
|
|
|
static int process_event_mask(struct perf_tool *tool __maybe_unused,
|
|
union perf_event *event,
|
|
struct perf_sample *sample __maybe_unused,
|
|
struct machine *machine __maybe_unused)
|
|
{
|
|
struct perf_record_cpu_map *map_event = &event->cpu_map;
|
|
struct perf_record_record_cpu_map *mask;
|
|
struct perf_record_cpu_map_data *data;
|
|
struct perf_cpu_map *map;
|
|
int i;
|
|
|
|
data = &map_event->data;
|
|
|
|
TEST_ASSERT_VAL("wrong type", data->type == PERF_CPU_MAP__MASK);
|
|
|
|
mask = (struct perf_record_record_cpu_map *)data->data;
|
|
|
|
TEST_ASSERT_VAL("wrong nr", mask->nr == 1);
|
|
|
|
for (i = 0; i < 20; i++) {
|
|
TEST_ASSERT_VAL("wrong cpu", test_bit(i, mask->mask));
|
|
}
|
|
|
|
map = cpu_map__new_data(data);
|
|
TEST_ASSERT_VAL("wrong nr", map->nr == 20);
|
|
|
|
for (i = 0; i < 20; i++) {
|
|
TEST_ASSERT_VAL("wrong cpu", map->map[i].cpu == i);
|
|
}
|
|
|
|
perf_cpu_map__put(map);
|
|
return 0;
|
|
}
|
|
|
|
static int process_event_cpus(struct perf_tool *tool __maybe_unused,
|
|
union perf_event *event,
|
|
struct perf_sample *sample __maybe_unused,
|
|
struct machine *machine __maybe_unused)
|
|
{
|
|
struct perf_record_cpu_map *map_event = &event->cpu_map;
|
|
struct cpu_map_entries *cpus;
|
|
struct perf_record_cpu_map_data *data;
|
|
struct perf_cpu_map *map;
|
|
|
|
data = &map_event->data;
|
|
|
|
TEST_ASSERT_VAL("wrong type", data->type == PERF_CPU_MAP__CPUS);
|
|
|
|
cpus = (struct cpu_map_entries *)data->data;
|
|
|
|
TEST_ASSERT_VAL("wrong nr", cpus->nr == 2);
|
|
TEST_ASSERT_VAL("wrong cpu", cpus->cpu[0] == 1);
|
|
TEST_ASSERT_VAL("wrong cpu", cpus->cpu[1] == 256);
|
|
|
|
map = cpu_map__new_data(data);
|
|
TEST_ASSERT_VAL("wrong nr", map->nr == 2);
|
|
TEST_ASSERT_VAL("wrong cpu", map->map[0].cpu == 1);
|
|
TEST_ASSERT_VAL("wrong cpu", map->map[1].cpu == 256);
|
|
TEST_ASSERT_VAL("wrong refcnt", refcount_read(&map->refcnt) == 1);
|
|
perf_cpu_map__put(map);
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int test__cpu_map_synthesize(struct test_suite *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
struct perf_cpu_map *cpus;
|
|
|
|
/* This one is better stores in mask. */
|
|
cpus = perf_cpu_map__new("0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19");
|
|
|
|
TEST_ASSERT_VAL("failed to synthesize map",
|
|
!perf_event__synthesize_cpu_map(NULL, cpus, process_event_mask, NULL));
|
|
|
|
perf_cpu_map__put(cpus);
|
|
|
|
/* This one is better stores in cpu values. */
|
|
cpus = perf_cpu_map__new("1,256");
|
|
|
|
TEST_ASSERT_VAL("failed to synthesize map",
|
|
!perf_event__synthesize_cpu_map(NULL, cpus, process_event_cpus, NULL));
|
|
|
|
perf_cpu_map__put(cpus);
|
|
return 0;
|
|
}
|
|
|
|
static int cpu_map_print(const char *str)
|
|
{
|
|
struct perf_cpu_map *map = perf_cpu_map__new(str);
|
|
char buf[100];
|
|
|
|
if (!map)
|
|
return -1;
|
|
|
|
cpu_map__snprint(map, buf, sizeof(buf));
|
|
perf_cpu_map__put(map);
|
|
|
|
return !strcmp(buf, str);
|
|
}
|
|
|
|
static int test__cpu_map_print(struct test_suite *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
TEST_ASSERT_VAL("failed to convert map", cpu_map_print("1"));
|
|
TEST_ASSERT_VAL("failed to convert map", cpu_map_print("1,5"));
|
|
TEST_ASSERT_VAL("failed to convert map", cpu_map_print("1,3,5,7,9,11,13,15,17,19,21-40"));
|
|
TEST_ASSERT_VAL("failed to convert map", cpu_map_print("2-5"));
|
|
TEST_ASSERT_VAL("failed to convert map", cpu_map_print("1,3-6,8-10,24,35-37"));
|
|
TEST_ASSERT_VAL("failed to convert map", cpu_map_print("1,3-6,8-10,24,35-37"));
|
|
TEST_ASSERT_VAL("failed to convert map", cpu_map_print("1-10,12-20,22-30,32-40"));
|
|
return 0;
|
|
}
|
|
|
|
static int test__cpu_map_merge(struct test_suite *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
struct perf_cpu_map *a = perf_cpu_map__new("4,2,1");
|
|
struct perf_cpu_map *b = perf_cpu_map__new("4,5,7");
|
|
struct perf_cpu_map *c = perf_cpu_map__merge(a, b);
|
|
char buf[100];
|
|
|
|
TEST_ASSERT_VAL("failed to merge map: bad nr", c->nr == 5);
|
|
cpu_map__snprint(c, buf, sizeof(buf));
|
|
TEST_ASSERT_VAL("failed to merge map: bad result", !strcmp(buf, "1-2,4-5,7"));
|
|
perf_cpu_map__put(b);
|
|
perf_cpu_map__put(c);
|
|
return 0;
|
|
}
|
|
|
|
DEFINE_SUITE("Synthesize cpu map", cpu_map_synthesize);
|
|
DEFINE_SUITE("Print cpu map", cpu_map_print);
|
|
DEFINE_SUITE("Merge cpu map", cpu_map_merge);
|