40628f9fff
Check that bpf_object__load() successfully creates map_in_maps
with BPF_MAP_TYPE_PERF_EVENT_ARRAY values.
These changes cover fix in the previous patch
"libbpf: Apply map_set_def_max_entries() for inner_maps on creation".
A command line output is:
- w/o fix
$ sudo ./test_maps
libbpf: map 'mim_array_pe': failed to create inner map: -22
libbpf: map 'mim_array_pe': failed to create: Invalid argument(-22)
libbpf: failed to load object './test_map_in_map.bpf.o'
Failed to load test prog
- with fix
$ sudo ./test_maps
...
test_maps: OK, 0 SKIPPED
Fixes: 646f02ffdd ("libbpf: Add BTF-defined map-in-map support")
Signed-off-by: Andrey Grafin <conquistador@yandex-team.ru>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Acked-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/bpf/20240117130619.9403-2-conquistador@yandex-team.ru
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
76 lines
1.6 KiB
C
76 lines
1.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* Copyright (c) 2018 Facebook */
|
|
#include <stddef.h>
|
|
#include <linux/bpf.h>
|
|
#include <linux/types.h>
|
|
#include <bpf/bpf_helpers.h>
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
|
|
__uint(max_entries, 1);
|
|
__uint(map_flags, 0);
|
|
__type(key, __u32);
|
|
__type(value, __u32);
|
|
} mim_array SEC(".maps");
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_HASH_OF_MAPS);
|
|
__uint(max_entries, 1);
|
|
__uint(map_flags, 0);
|
|
__type(key, int);
|
|
__type(value, __u32);
|
|
} mim_hash SEC(".maps");
|
|
|
|
/* The following three maps are used to test
|
|
* perf_event_array map can be an inner
|
|
* map of hash/array_of_maps.
|
|
*/
|
|
struct perf_event_array {
|
|
__uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
|
|
__type(key, __u32);
|
|
__type(value, __u32);
|
|
} inner_map0 SEC(".maps");
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
|
|
__uint(max_entries, 1);
|
|
__type(key, __u32);
|
|
__array(values, struct perf_event_array);
|
|
} mim_array_pe SEC(".maps") = {
|
|
.values = {&inner_map0}};
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_HASH_OF_MAPS);
|
|
__uint(max_entries, 1);
|
|
__type(key, __u32);
|
|
__array(values, struct perf_event_array);
|
|
} mim_hash_pe SEC(".maps") = {
|
|
.values = {&inner_map0}};
|
|
|
|
SEC("xdp")
|
|
int xdp_mimtest0(struct xdp_md *ctx)
|
|
{
|
|
int value = 123;
|
|
int *value_p;
|
|
int key = 0;
|
|
void *map;
|
|
|
|
map = bpf_map_lookup_elem(&mim_array, &key);
|
|
if (!map)
|
|
return XDP_DROP;
|
|
|
|
bpf_map_update_elem(map, &key, &value, 0);
|
|
value_p = bpf_map_lookup_elem(map, &key);
|
|
if (!value_p || *value_p != 123)
|
|
return XDP_DROP;
|
|
|
|
map = bpf_map_lookup_elem(&mim_hash, &key);
|
|
if (!map)
|
|
return XDP_DROP;
|
|
|
|
bpf_map_update_elem(map, &key, &value, 0);
|
|
|
|
return XDP_PASS;
|
|
}
|
|
|
|
char _license[] SEC("license") = "GPL";
|