Fix all selftests to include libbpf header files with the bpf/ prefix, to
be consistent with external users of the library. Also ensure that all
includes of exported libbpf header files (those that are exported on 'make
install' of the library) use bracketed includes instead of quoted.
To not break the build, keep the old include path until everything has been
changed to the new one; a subsequent patch will remove that.
Fixes: 6910d7d386
("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/157952560568.1683545.9649335788846513446.stgit@toke.dk
71 lines
1.4 KiB
C
71 lines
1.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* Copyright (c) 2018 Facebook */
|
|
#include <linux/bpf.h>
|
|
#include <bpf/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))
|
|
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))
|
|
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";
|