mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 03:42:52 +00:00
c5c584d2db
This is only used for the kernel maps, shave 24 bytes out 'struct map' and just traverse the existing per ip rbtree to look for maps by name, use a front end cache to reuse the last search if its the same name. After this 'struct map' is down to just two cachelines: $ pahole -C map ~/bin/perf struct map { union { struct rb_node rb_node __attribute__((__aligned__(8))); /* 0 24 */ struct list_head node; /* 0 16 */ } __attribute__((__aligned__(8))); /* 0 24 */ u64 start; /* 24 8 */ u64 end; /* 32 8 */ _Bool erange_warned; /* 40 1 */ /* XXX 3 bytes hole, try to pack */ u32 priv; /* 44 4 */ u32 prot; /* 48 4 */ u32 flags; /* 52 4 */ u64 pgoff; /* 56 8 */ /* --- cacheline 1 boundary (64 bytes) --- */ u64 reloc; /* 64 8 */ u32 maj; /* 72 4 */ u32 min; /* 76 4 */ u64 ino; /* 80 8 */ u64 ino_generation; /* 88 8 */ u64 (*map_ip)(struct map *, u64); /* 96 8 */ u64 (*unmap_ip)(struct map *, u64); /* 104 8 */ struct dso * dso; /* 112 8 */ refcount_t refcnt; /* 120 4 */ /* size: 128, cachelines: 2, members: 17 */ /* sum members: 121, holes: 1, sum holes: 3 */ /* padding: 4 */ /* forced alignments: 1 */ } __attribute__((__aligned__(8))); $ Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lkml.kernel.org/n/tip-bvr8fqfgzxtgnhnwt5sssx5g@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
121 lines
3.1 KiB
C
121 lines
3.1 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/compiler.h>
|
|
#include <linux/kernel.h>
|
|
#include "tests.h"
|
|
#include "map.h"
|
|
#include "map_groups.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 map_groups *mg)
|
|
{
|
|
struct map *map;
|
|
unsigned int i = 0;
|
|
|
|
map_groups__for_each_entry(mg, map) {
|
|
if (i > 0)
|
|
TEST_ASSERT_VAL("less maps expected", (map && i < size) || (!map && i == size));
|
|
|
|
TEST_ASSERT_VAL("wrong map start", map->start == merged[i].start);
|
|
TEST_ASSERT_VAL("wrong map end", map->end == merged[i].end);
|
|
TEST_ASSERT_VAL("wrong map name", !strcmp(map->dso->name, merged[i].name));
|
|
TEST_ASSERT_VAL("wrong map refcnt", refcount_read(&map->refcnt) == 1);
|
|
|
|
i++;
|
|
}
|
|
|
|
return TEST_OK;
|
|
}
|
|
|
|
int test__map_groups__merge_in(struct test *t __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
struct map_groups mg;
|
|
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;
|
|
|
|
map_groups__init(&mg, NULL);
|
|
|
|
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;
|
|
map_groups__insert(&mg, map);
|
|
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 = map_groups__merge_in(&mg, map_kcore1);
|
|
TEST_ASSERT_VAL("failed to merge map", !ret);
|
|
|
|
ret = check_maps(merged12, ARRAY_SIZE(merged12), &mg);
|
|
TEST_ASSERT_VAL("merge check failed", !ret);
|
|
|
|
ret = map_groups__merge_in(&mg, map_kcore2);
|
|
TEST_ASSERT_VAL("failed to merge map", !ret);
|
|
|
|
ret = check_maps(merged12, ARRAY_SIZE(merged12), &mg);
|
|
TEST_ASSERT_VAL("merge check failed", !ret);
|
|
|
|
ret = map_groups__merge_in(&mg, map_kcore3);
|
|
TEST_ASSERT_VAL("failed to merge map", !ret);
|
|
|
|
ret = check_maps(merged3, ARRAY_SIZE(merged3), &mg);
|
|
TEST_ASSERT_VAL("merge check failed", !ret);
|
|
return TEST_OK;
|
|
}
|