189c83bdde
Currently the recursion test is hooking __htab_map_lookup_elem function, which is invoked both from bpf_prog and bpf syscall. But in our kernel build, the __htab_map_lookup_elem gets inlined within the htab_map_lookup_elem, so it's not trigered and the test fails. Fixing this by using htab_map_delete_elem, which is not inlined for bpf_prog calls (like htab_map_lookup_elem is) and is used directly as pointer for map_delete_elem, so it won't disappear by inlining. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Song Liu <songliubraving@fb.com> Link: https://lore.kernel.org/bpf/YVnfFTL/3T6jOwHI@krava
44 lines
747 B
C
44 lines
747 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* Copyright (c) 2021 Facebook */
|
|
|
|
#include "vmlinux.h"
|
|
#include <bpf/bpf_helpers.h>
|
|
#include <bpf/bpf_tracing.h>
|
|
|
|
char _license[] SEC("license") = "GPL";
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_HASH);
|
|
__uint(max_entries, 1);
|
|
__type(key, int);
|
|
__type(value, long);
|
|
} hash1 SEC(".maps");
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_HASH);
|
|
__uint(max_entries, 1);
|
|
__type(key, int);
|
|
__type(value, long);
|
|
} hash2 SEC(".maps");
|
|
|
|
int pass1 = 0;
|
|
int pass2 = 0;
|
|
|
|
SEC("fentry/htab_map_delete_elem")
|
|
int BPF_PROG(on_delete, struct bpf_map *map)
|
|
{
|
|
int key = 0;
|
|
|
|
if (map == (void *)&hash1) {
|
|
pass1++;
|
|
return 0;
|
|
}
|
|
if (map == (void *)&hash2) {
|
|
pass2++;
|
|
bpf_map_delete_elem(&hash2, &key);
|
|
return 0;
|
|
}
|
|
|
|
return 0;
|
|
}
|