ba39486d2c
[Changes from V1:
- The __compat_break has been abandoned in favor of
a more readable can_loop macro that can be used anywhere, including
loop conditions.]
The macro list_for_each_entry is defined in bpf_arena_list.h as
follows:
#define list_for_each_entry(pos, head, member) \
for (void * ___tmp = (pos = list_entry_safe((head)->first, \
typeof(*(pos)), member), \
(void *)0); \
pos && ({ ___tmp = (void *)pos->member.next; 1; }); \
cond_break, \
pos = list_entry_safe((void __arena *)___tmp, typeof(*(pos)), member))
The macro cond_break, in turn, expands to a statement expression that
contains a `break' statement. Compound statement expressions, and the
subsequent ability of placing statements in the header of a `for'
loop, are GNU extensions.
Unfortunately, clang implements this GNU extension differently than
GCC:
- In GCC the `break' statement is bound to the containing "breakable"
context in which the defining `for' appears. If there is no such
context, GCC emits a warning: break statement without enclosing `for'
o `switch' statement.
- In clang the `break' statement is bound to the defining `for'. If
the defining `for' is itself inside some breakable construct, then
clang emits a -Wgcc-compat warning.
This patch adds a new macro can_loop to bpf_experimental, that
implements the same logic than cond_break but evaluates to a boolean
expression. The patch also changes all the current instances of usage
of cond_break withing the header of loop accordingly.
Tested in bpf-next master.
No regressions.
Signed-off-by: Jose E. Marchesi <jose.marchesi@oracle.com>
Cc: david.faust@oracle.com
Cc: cupertino.miranda@oracle.com
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Link: https://lore.kernel.org/r/20240511212243.23477-1-jose.marchesi@oracle.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
87 lines
1.7 KiB
C
87 lines
1.7 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 */
|
|
#ifdef __TARGET_ARCH_arm64
|
|
__ulong(map_extra, 0x1ull << 32); /* start of mmap() region */
|
|
#else
|
|
__ulong(map_extra, 0x1ull << 44); /* start of mmap() region */
|
|
#endif
|
|
} arena SEC(".maps");
|
|
|
|
#include "bpf_arena_alloc.h"
|
|
#include "bpf_arena_list.h"
|
|
|
|
struct elem {
|
|
struct arena_list_node node;
|
|
__u64 value;
|
|
};
|
|
|
|
struct arena_list_head __arena *list_head;
|
|
int list_sum;
|
|
int cnt;
|
|
bool skip = false;
|
|
|
|
#ifdef __BPF_FEATURE_ADDR_SPACE_CAST
|
|
long __arena arena_sum;
|
|
int __arena test_val = 1;
|
|
struct arena_list_head __arena global_head;
|
|
#else
|
|
long arena_sum SEC(".addr_space.1");
|
|
int test_val SEC(".addr_space.1");
|
|
#endif
|
|
|
|
int zero;
|
|
|
|
SEC("syscall")
|
|
int arena_list_add(void *ctx)
|
|
{
|
|
#ifdef __BPF_FEATURE_ADDR_SPACE_CAST
|
|
__u64 i;
|
|
|
|
list_head = &global_head;
|
|
|
|
for (i = zero; i < cnt && can_loop; i++) {
|
|
struct elem __arena *n = bpf_alloc(sizeof(*n));
|
|
|
|
test_val++;
|
|
n->value = i;
|
|
arena_sum += i;
|
|
list_add_head(&n->node, list_head);
|
|
}
|
|
#else
|
|
skip = true;
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
SEC("syscall")
|
|
int arena_list_del(void *ctx)
|
|
{
|
|
#ifdef __BPF_FEATURE_ADDR_SPACE_CAST
|
|
struct elem __arena *n;
|
|
int sum = 0;
|
|
|
|
arena_sum = 0;
|
|
list_for_each_entry(n, list_head, node) {
|
|
sum += n->value;
|
|
arena_sum += n->value;
|
|
list_del(&n->node);
|
|
bpf_free(n);
|
|
}
|
|
list_sum = sum;
|
|
#else
|
|
skip = true;
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
char _license[] SEC("license") = "GPL";
|