e5116f46d4
Later changes will add reference count checking for struct map, start and end are frequently accessed variables. Add an accessor so that the reference count check is only necessary in one place. Signed-off-by: Ian Rogers <irogers@google.com> 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: Stephane Eranian <eranian@google.com> 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/r/20230320212248.1175731-2-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
127 lines
3.3 KiB
C
127 lines
3.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/compiler.h>
|
|
#include <linux/kernel.h>
|
|
#include "tests.h"
|
|
#include "map.h"
|
|
#include "maps.h"
|
|
#include "dso.h"
|
|
#include "debug.h"
|
|
|
|
struct map_def {
|
|
const char *name;
|
|
u64 start;
|
|
u64 end;
|
|
};
|
|
|
|
static int check_maps(struct map_def *merged, unsigned int size, struct maps *maps)
|
|
{
|
|
struct map_rb_node *rb_node;
|
|
unsigned int i = 0;
|
|
|
|
maps__for_each_entry(maps, rb_node) {
|
|
struct map *map = rb_node->map;
|
|
|
|
if (i > 0)
|
|
TEST_ASSERT_VAL("less maps expected", (map && i < size) || (!map && i == size));
|
|
|
|
TEST_ASSERT_VAL("wrong map start", map__start(map) == merged[i].start);
|
|
TEST_ASSERT_VAL("wrong map end", map__end(map) == merged[i].end);
|
|
TEST_ASSERT_VAL("wrong map name", !strcmp(map__dso(map)->name, merged[i].name));
|
|
TEST_ASSERT_VAL("wrong map refcnt", refcount_read(&map->refcnt) == 1);
|
|
|
|
i++;
|
|
}
|
|
|
|
return TEST_OK;
|
|
}
|
|
|
|
static int test__maps__merge_in(struct test_suite *t __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
unsigned int i;
|
|
struct map_def bpf_progs[] = {
|
|
{ "bpf_prog_1", 200, 300 },
|
|
{ "bpf_prog_2", 500, 600 },
|
|
{ "bpf_prog_3", 800, 900 },
|
|
};
|
|
struct map_def merged12[] = {
|
|
{ "kcore1", 100, 200 },
|
|
{ "bpf_prog_1", 200, 300 },
|
|
{ "kcore1", 300, 500 },
|
|
{ "bpf_prog_2", 500, 600 },
|
|
{ "kcore1", 600, 800 },
|
|
{ "bpf_prog_3", 800, 900 },
|
|
{ "kcore1", 900, 1000 },
|
|
};
|
|
struct map_def merged3[] = {
|
|
{ "kcore1", 100, 200 },
|
|
{ "bpf_prog_1", 200, 300 },
|
|
{ "kcore1", 300, 500 },
|
|
{ "bpf_prog_2", 500, 600 },
|
|
{ "kcore1", 600, 800 },
|
|
{ "bpf_prog_3", 800, 900 },
|
|
{ "kcore1", 900, 1000 },
|
|
{ "kcore3", 1000, 1100 },
|
|
};
|
|
struct map *map_kcore1, *map_kcore2, *map_kcore3;
|
|
int ret;
|
|
struct maps *maps = maps__new(NULL);
|
|
|
|
TEST_ASSERT_VAL("failed to create maps", maps);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(bpf_progs); i++) {
|
|
struct map *map;
|
|
|
|
map = dso__new_map(bpf_progs[i].name);
|
|
TEST_ASSERT_VAL("failed to create map", map);
|
|
|
|
map->start = bpf_progs[i].start;
|
|
map->end = bpf_progs[i].end;
|
|
TEST_ASSERT_VAL("failed to insert map", maps__insert(maps, map) == 0);
|
|
map__put(map);
|
|
}
|
|
|
|
map_kcore1 = dso__new_map("kcore1");
|
|
TEST_ASSERT_VAL("failed to create map", map_kcore1);
|
|
|
|
map_kcore2 = dso__new_map("kcore2");
|
|
TEST_ASSERT_VAL("failed to create map", map_kcore2);
|
|
|
|
map_kcore3 = dso__new_map("kcore3");
|
|
TEST_ASSERT_VAL("failed to create map", map_kcore3);
|
|
|
|
/* kcore1 map overlaps over all bpf maps */
|
|
map_kcore1->start = 100;
|
|
map_kcore1->end = 1000;
|
|
|
|
/* kcore2 map hides behind bpf_prog_2 */
|
|
map_kcore2->start = 550;
|
|
map_kcore2->end = 570;
|
|
|
|
/* kcore3 map hides behind bpf_prog_3, kcore1 and adds new map */
|
|
map_kcore3->start = 880;
|
|
map_kcore3->end = 1100;
|
|
|
|
ret = maps__merge_in(maps, map_kcore1);
|
|
TEST_ASSERT_VAL("failed to merge map", !ret);
|
|
|
|
ret = check_maps(merged12, ARRAY_SIZE(merged12), maps);
|
|
TEST_ASSERT_VAL("merge check failed", !ret);
|
|
|
|
ret = maps__merge_in(maps, map_kcore2);
|
|
TEST_ASSERT_VAL("failed to merge map", !ret);
|
|
|
|
ret = check_maps(merged12, ARRAY_SIZE(merged12), maps);
|
|
TEST_ASSERT_VAL("merge check failed", !ret);
|
|
|
|
ret = maps__merge_in(maps, map_kcore3);
|
|
TEST_ASSERT_VAL("failed to merge map", !ret);
|
|
|
|
ret = check_maps(merged3, ARRAY_SIZE(merged3), maps);
|
|
TEST_ASSERT_VAL("merge check failed", !ret);
|
|
|
|
maps__delete(maps);
|
|
return TEST_OK;
|
|
}
|
|
|
|
DEFINE_SUITE("maps__merge_in", maps__merge_in);
|