* [PATCH bpf v2] libbpf: Apply map_set_def_max_entries() for inner_maps on creation
@ 2024-01-12 12:10 Andrey Grafin
2024-01-12 19:39 ` Yonghong Song
2024-01-12 19:47 ` Martin KaFai Lau
0 siblings, 2 replies; 3+ messages in thread
From: Andrey Grafin @ 2024-01-12 12:10 UTC (permalink / raw)
To: bpf; +Cc: andrii
This patch allows to create BPF_MAP_TYPE_ARRAY_OF_MAPS and
BPF_MAP_TYPE_HASH_OF_MAPS with values of BPF_MAP_TYPE_PERF_EVENT_ARRAY.
Previous behaviour created a zero filled btf_map_def for inner maps and
tried to use it for a map creation but the linux kernel forbids to create
a BPF_MAP_TYPE_PERF_EVENT_ARRAY map with max_entries=0.
A simple bpf snippet to reproduce:
struct inner_map {
__uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
__uint(key_size, sizeof(int));
__uint(value_size, sizeof(u32));
} inner_map0 SEC(".maps"), inner_map1 SEC(".maps");
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, 2);
__type(key, u32);
__array(values, struct inner_map);
} outer_map SEC(".maps") = {
.values = {&inner_map0, &inner_map1}};
...
Previous behaviour:
# sudo bpftool prog load ./bpf_sample.elf /sys/fs/bpf/test
libbpf: map 'outer_map': failed to create inner map: -22
libbpf: map 'outer_map': failed to create: Invalid argument(-22)
libbpf: failed to load object './bpf_sample.elf'
Error: failed to load object file
# sudo strace -e bpf bpftool prog load ./bpf_sample.elf /sys/fs/bpf/test
...
bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
map_name="inner_map0", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 4
bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
map_name="inner_map1", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 5
bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
value_size=4, max_entries=0, map_flags=0, inner_map_fd=0,
map_name="outer_map.inner", map_ifindex=0, btf_fd=0,
btf_key_type_id=0, btf_value_type_id=0, btf_vmlinux_value_type_id=0,
map_extra=0}, 72) = -1 EINVAL (Invalid argument)
New behaviour:
# sudo strace -e bpf bpftool prog load ./bpf_sample.elf /sys/fs/bpf/test
...
bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
map_name="inner_map0", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 4
bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
map_name="inner_map1", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 5
bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
map_name="outer_map.inner", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 6
bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_ARRAY_OF_MAPS, key_size=4,
value_size=4, max_entries=2, map_flags=0, inner_map_fd=6,
map_name="outer_map", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 7
bpf(BPF_MAP_UPDATE_ELEM, {map_fd=7, key=0x7ffc89f2de54,
value=0x7ffc89f2de58,flags=BPF_ANY}, 32) = 0
bpf(BPF_MAP_UPDATE_ELEM, {map_fd=7, key=0x7ffc89f2de54,
value=0x7ffc89f2de58, flags=BPF_ANY}, 32) = 0
...
+++ exited with 0 +++
Signed-off-by: Andrey Grafin <conquistador@yandex-team.ru>
---
tools/lib/bpf/libbpf.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index e067be95da3c..8f4d580187aa 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -70,6 +70,7 @@
static struct bpf_map *bpf_object__add_map(struct bpf_object *obj);
static bool prog_is_subprog(const struct bpf_object *obj, const struct bpf_program *prog);
+static int map_set_def_max_entries(struct bpf_map *map);
static const char * const attach_type_name[] = {
[BPF_CGROUP_INET_INGRESS] = "cgroup_inet_ingress",
@@ -5212,6 +5213,9 @@ static int bpf_object__create_map(struct bpf_object *obj, struct bpf_map *map, b
if (bpf_map_type__is_map_in_map(def->type)) {
if (map->inner_map) {
+ err = map_set_def_max_entries(map->inner_map);
+ if (err)
+ return err;
err = bpf_object__create_map(obj, map->inner_map, true);
if (err) {
pr_warn("map '%s': failed to create inner map: %d\n",
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf v2] libbpf: Apply map_set_def_max_entries() for inner_maps on creation
2024-01-12 12:10 [PATCH bpf v2] libbpf: Apply map_set_def_max_entries() for inner_maps on creation Andrey Grafin
@ 2024-01-12 19:39 ` Yonghong Song
2024-01-12 19:47 ` Martin KaFai Lau
1 sibling, 0 replies; 3+ messages in thread
From: Yonghong Song @ 2024-01-12 19:39 UTC (permalink / raw)
To: Andrey Grafin, bpf; +Cc: andrii
On 1/12/24 4:10 AM, Andrey Grafin wrote:
> This patch allows to create BPF_MAP_TYPE_ARRAY_OF_MAPS and
> BPF_MAP_TYPE_HASH_OF_MAPS with values of BPF_MAP_TYPE_PERF_EVENT_ARRAY.
>
> Previous behaviour created a zero filled btf_map_def for inner maps and
> tried to use it for a map creation but the linux kernel forbids to create
> a BPF_MAP_TYPE_PERF_EVENT_ARRAY map with max_entries=0.
>
> A simple bpf snippet to reproduce:
> struct inner_map {
> __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
> __uint(key_size, sizeof(int));
> __uint(value_size, sizeof(u32));
> } inner_map0 SEC(".maps"), inner_map1 SEC(".maps");
>
> struct {
> __uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
> __uint(max_entries, 2);
> __type(key, u32);
> __array(values, struct inner_map);
> } outer_map SEC(".maps") = {
> .values = {&inner_map0, &inner_map1}};
> ...
What I mean is to add a selftest in tools/testing/selftests/bpf/ directory,
not a test with partial code in the commit message. You can add another
subtest in tools/testing/selftests/bpf/progs/map_in_map.c.
>
> Previous behaviour:
> # sudo bpftool prog load ./bpf_sample.elf /sys/fs/bpf/test
> libbpf: map 'outer_map': failed to create inner map: -22
> libbpf: map 'outer_map': failed to create: Invalid argument(-22)
> libbpf: failed to load object './bpf_sample.elf'
> Error: failed to load object file
>
> # sudo strace -e bpf bpftool prog load ./bpf_sample.elf /sys/fs/bpf/test
> ...
> bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
> value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
> map_name="inner_map0", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
> btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 4
> bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
> value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
> map_name="inner_map1", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
> btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 5
> bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
> value_size=4, max_entries=0, map_flags=0, inner_map_fd=0,
> map_name="outer_map.inner", map_ifindex=0, btf_fd=0,
> btf_key_type_id=0, btf_value_type_id=0, btf_vmlinux_value_type_id=0,
> map_extra=0}, 72) = -1 EINVAL (Invalid argument)
>
> New behaviour:
> # sudo strace -e bpf bpftool prog load ./bpf_sample.elf /sys/fs/bpf/test
> ...
> bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
> value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
> map_name="inner_map0", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
> btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 4
> bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
> value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
> map_name="inner_map1", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
> btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 5
> bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
> value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
> map_name="outer_map.inner", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
> btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 6
> bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_ARRAY_OF_MAPS, key_size=4,
> value_size=4, max_entries=2, map_flags=0, inner_map_fd=6,
> map_name="outer_map", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
> btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 7
> bpf(BPF_MAP_UPDATE_ELEM, {map_fd=7, key=0x7ffc89f2de54,
> value=0x7ffc89f2de58,flags=BPF_ANY}, 32) = 0
> bpf(BPF_MAP_UPDATE_ELEM, {map_fd=7, key=0x7ffc89f2de54,
> value=0x7ffc89f2de58, flags=BPF_ANY}, 32) = 0
> ...
> +++ exited with 0 +++
>
> Signed-off-by: Andrey Grafin <conquistador@yandex-team.ru>
> ---
> tools/lib/bpf/libbpf.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index e067be95da3c..8f4d580187aa 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -70,6 +70,7 @@
>
> static struct bpf_map *bpf_object__add_map(struct bpf_object *obj);
> static bool prog_is_subprog(const struct bpf_object *obj, const struct bpf_program *prog);
> +static int map_set_def_max_entries(struct bpf_map *map);
>
> static const char * const attach_type_name[] = {
> [BPF_CGROUP_INET_INGRESS] = "cgroup_inet_ingress",
> @@ -5212,6 +5213,9 @@ static int bpf_object__create_map(struct bpf_object *obj, struct bpf_map *map, b
>
> if (bpf_map_type__is_map_in_map(def->type)) {
> if (map->inner_map) {
> + err = map_set_def_max_entries(map->inner_map);
> + if (err)
> + return err;
> err = bpf_object__create_map(obj, map->inner_map, true);
> if (err) {
> pr_warn("map '%s': failed to create inner map: %d\n",
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf v2] libbpf: Apply map_set_def_max_entries() for inner_maps on creation
2024-01-12 12:10 [PATCH bpf v2] libbpf: Apply map_set_def_max_entries() for inner_maps on creation Andrey Grafin
2024-01-12 19:39 ` Yonghong Song
@ 2024-01-12 19:47 ` Martin KaFai Lau
1 sibling, 0 replies; 3+ messages in thread
From: Martin KaFai Lau @ 2024-01-12 19:47 UTC (permalink / raw)
To: Andrey Grafin; +Cc: andrii, bpf, Yonghong Song
On 1/12/24 4:10 AM, Andrey Grafin wrote:
> This patch allows to create BPF_MAP_TYPE_ARRAY_OF_MAPS and
> BPF_MAP_TYPE_HASH_OF_MAPS with values of BPF_MAP_TYPE_PERF_EVENT_ARRAY.
>
> Previous behaviour created a zero filled btf_map_def for inner maps and
> tried to use it for a map creation but the linux kernel forbids to create
> a BPF_MAP_TYPE_PERF_EVENT_ARRAY map with max_entries=0.
>
> A simple bpf snippet to reproduce:
> struct inner_map {
> __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
> __uint(key_size, sizeof(int));
> __uint(value_size, sizeof(u32));
> } inner_map0 SEC(".maps"), inner_map1 SEC(".maps");
>
> struct {
> __uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
> __uint(max_entries, 2);
> __type(key, u32);
> __array(values, struct inner_map);
> } outer_map SEC(".maps") = {
> .values = {&inner_map0, &inner_map1}};
> ...
>
> Previous behaviour:
> # sudo bpftool prog load ./bpf_sample.elf /sys/fs/bpf/test
> libbpf: map 'outer_map': failed to create inner map: -22
> libbpf: map 'outer_map': failed to create: Invalid argument(-22)
> libbpf: failed to load object './bpf_sample.elf'
> Error: failed to load object file
>
> # sudo strace -e bpf bpftool prog load ./bpf_sample.elf /sys/fs/bpf/test
> ...
> bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
> value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
> map_name="inner_map0", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
> btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 4
> bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
> value_size=4, max_entries=16, map_flags=0, inner_map_fd=0,
> map_name="inner_map1", map_ifindex=0, btf_fd=0, btf_key_type_id=0,
> btf_value_type_id=0, btf_vmlinux_value_type_id=0, map_extra=0}, 72) = 5
> bpf(BPF_MAP_CREATE, {map_type=BPF_MAP_TYPE_PERF_EVENT_ARRAY, key_size=4,
> value_size=4, max_entries=0, map_flags=0, inner_map_fd=0,
> map_name="outer_map.inner", map_ifindex=0, btf_fd=0,
> btf_key_type_id=0, btf_value_type_id=0, btf_vmlinux_value_type_id=0,
> map_extra=0}, 72) = -1 EINVAL (Invalid argument)
The change makes sense. Please help to add a real selftest to catch future
regression. I believe it is what Yonghong has already asked in v1. Some of the
existing "progs/*map_in_map*.c" may be a good candidate to add this test case.
pw-bot: cr
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-12 19:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-12 12:10 [PATCH bpf v2] libbpf: Apply map_set_def_max_entries() for inner_maps on creation Andrey Grafin
2024-01-12 19:39 ` Yonghong Song
2024-01-12 19:47 ` Martin KaFai Lau
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.