10ebe835c9
The selftests use to tell LLVM about special pointers. For LLVM there is nothing "arena" about them. They are simply pointers in a different address space. Hence LLVM diff https://github.com/llvm/llvm-project/pull/85161 renamed: . macro __BPF_FEATURE_ARENA_CAST -> __BPF_FEATURE_ADDR_SPACE_CAST . global variables in __attribute__((address_space(N))) are now placed in section named ".addr_space.N" instead of ".arena.N". Adjust libbpf, bpftool, and selftests to match LLVM. Signed-off-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Stanislav Fomichev <sdf@google.com> Link: https://lore.kernel.org/bpf/20240315021834.62988-3-alexei.starovoitov@gmail.com
48 lines
1 KiB
C
48 lines
1 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */
|
|
#include <vmlinux.h>
|
|
#include <bpf/bpf_helpers.h>
|
|
#include <bpf/bpf_tracing.h>
|
|
#include <bpf/bpf_core_read.h>
|
|
#include "bpf_experimental.h"
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_ARENA);
|
|
__uint(map_flags, BPF_F_MMAPABLE);
|
|
__uint(max_entries, 100); /* number of pages */
|
|
} arena SEC(".maps");
|
|
|
|
#include "bpf_arena_htab.h"
|
|
|
|
void __arena *htab_for_user;
|
|
bool skip = false;
|
|
|
|
int zero = 0;
|
|
|
|
SEC("syscall")
|
|
int arena_htab_llvm(void *ctx)
|
|
{
|
|
#if defined(__BPF_FEATURE_ADDR_SPACE_CAST) || defined(BPF_ARENA_FORCE_ASM)
|
|
struct htab __arena *htab;
|
|
__u64 i;
|
|
|
|
htab = bpf_alloc(sizeof(*htab));
|
|
cast_kern(htab);
|
|
htab_init(htab);
|
|
|
|
/* first run. No old elems in the table */
|
|
for (i = zero; i < 1000; i++)
|
|
htab_update_elem(htab, i, i);
|
|
|
|
/* should replace all elems with new ones */
|
|
for (i = zero; i < 1000; i++)
|
|
htab_update_elem(htab, i, i);
|
|
cast_user(htab);
|
|
htab_for_user = htab;
|
|
#else
|
|
skip = true;
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
char _license[] SEC("license") = "GPL";
|