36b5d47113
Split off few legacy things from bpf_helpers.h into separate
bpf_legacy.h file:
- load_{byte|half|word};
- remove extra inner_idx and numa_node fields from bpf_map_def and
introduce bpf_map_def_legacy for use in samples;
- move BPF_ANNOTATE_KV_PAIR into bpf_legacy.h.
Adjust samples and selftests accordingly by either including
bpf_legacy.h and using bpf_map_def_legacy, or switching to BTF-defined
maps altogether.
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20191008175942.1769476-3-andriin@fb.com
72 lines
1.4 KiB
C
72 lines
1.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* Copyright (c) 2018 Facebook */
|
|
#include <linux/bpf.h>
|
|
#include "bpf_helpers.h"
|
|
#include "bpf_legacy.h"
|
|
|
|
int _version SEC("version") = 1;
|
|
|
|
struct ipv_counts {
|
|
unsigned int v4;
|
|
unsigned int v6;
|
|
};
|
|
|
|
/* just to validate we can handle maps in multiple sections */
|
|
struct bpf_map_def SEC("maps") btf_map_legacy = {
|
|
.type = BPF_MAP_TYPE_ARRAY,
|
|
.key_size = sizeof(int),
|
|
.value_size = sizeof(long long),
|
|
.max_entries = 4,
|
|
};
|
|
|
|
BPF_ANNOTATE_KV_PAIR(btf_map_legacy, int, struct ipv_counts);
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_ARRAY);
|
|
__uint(max_entries, 4);
|
|
__type(key, int);
|
|
__type(value, struct ipv_counts);
|
|
} btf_map SEC(".maps");
|
|
|
|
struct dummy_tracepoint_args {
|
|
unsigned long long pad;
|
|
struct sock *sock;
|
|
};
|
|
|
|
__attribute__((noinline))
|
|
static int test_long_fname_2(struct dummy_tracepoint_args *arg)
|
|
{
|
|
struct ipv_counts *counts;
|
|
int key = 0;
|
|
|
|
if (!arg->sock)
|
|
return 0;
|
|
|
|
counts = bpf_map_lookup_elem(&btf_map, &key);
|
|
if (!counts)
|
|
return 0;
|
|
|
|
counts->v6++;
|
|
|
|
/* just verify we can reference both maps */
|
|
counts = bpf_map_lookup_elem(&btf_map_legacy, &key);
|
|
if (!counts)
|
|
return 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
__attribute__((noinline))
|
|
static int test_long_fname_1(struct dummy_tracepoint_args *arg)
|
|
{
|
|
return test_long_fname_2(arg);
|
|
}
|
|
|
|
SEC("dummy_tracepoint")
|
|
int _dummy_tracepoint(struct dummy_tracepoint_args *arg)
|
|
{
|
|
return test_long_fname_1(arg);
|
|
}
|
|
|
|
char _license[] SEC("license") = "GPL";
|