mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
a33c0c792d
Build the kernel and selftest with clang compiler with LLVM=1,
make -j LLVM=1
make -C tools/testing/selftests/bpf -j LLVM=1
I hit the following selftests/bpf compilation error:
In file included from test_cpp.cpp:3:
/.../tools/testing/selftests/bpf/tools/include/bpf/libbpf.h:73:8:
error: 'relaxed_core_relocs' is deprecated: libbpf v0.6+: field has no effect [-Werror,-Wdeprecated-declarations]
struct bpf_object_open_opts {
^
test_cpp.cpp:56:2: note: in implicit move constructor for 'bpf_object_open_opts' first required here
LIBBPF_OPTS(bpf_object_open_opts, opts);
^
/.../tools/testing/selftests/bpf/tools/include/bpf/libbpf_common.h:77:3: note: expanded from macro 'LIBBPF_OPTS'
(struct TYPE) { \
^
/.../tools/testing/selftests/bpf/tools/include/bpf/libbpf.h:90:2: note: 'relaxed_core_relocs' has been explicitly marked deprecated here
LIBBPF_DEPRECATED_SINCE(0, 6, "field has no effect")
^
/.../tools/testing/selftests/bpf/tools/include/bpf/libbpf_common.h:24:4: note: expanded from macro 'LIBBPF_DEPRECATED_SINCE'
(LIBBPF_DEPRECATED("libbpf v" # major "." # minor "+: " msg))
^
/.../tools/testing/selftests/bpf/tools/include/bpf/libbpf_common.h:19:47: note: expanded from macro 'LIBBPF_DEPRECATED'
#define LIBBPF_DEPRECATED(msg) __attribute__((deprecated(msg)))
There are two ways to fix the issue, one is to use GCC diagnostic ignore pragma, and the
other is to open code bpf_object_open_opts instead of using LIBBPF_OPTS.
Since in general LIBBPF_OPTS is preferred, the patch fixed the issue by
adding proper GCC diagnostic ignore pragmas.
Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220217194005.2765348-1-yhs@fb.com
123 lines
2.5 KiB
C++
123 lines
2.5 KiB
C++
/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */
|
|
#include <iostream>
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
#include <bpf/libbpf.h>
|
|
#pragma GCC diagnostic pop
|
|
#include <bpf/bpf.h>
|
|
#include <bpf/btf.h>
|
|
#include "test_core_extern.skel.h"
|
|
|
|
template <typename T>
|
|
class Skeleton {
|
|
private:
|
|
T *skel;
|
|
public:
|
|
Skeleton(): skel(nullptr) { }
|
|
|
|
~Skeleton() { if (skel) T::destroy(skel); }
|
|
|
|
int open(const struct bpf_object_open_opts *opts = nullptr)
|
|
{
|
|
int err;
|
|
|
|
if (skel)
|
|
return -EBUSY;
|
|
|
|
skel = T::open(opts);
|
|
err = libbpf_get_error(skel);
|
|
if (err) {
|
|
skel = nullptr;
|
|
return err;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int load() { return T::load(skel); }
|
|
|
|
int attach() { return T::attach(skel); }
|
|
|
|
void detach() { return T::detach(skel); }
|
|
|
|
const T* operator->() const { return skel; }
|
|
|
|
T* operator->() { return skel; }
|
|
|
|
const T *get() const { return skel; }
|
|
};
|
|
|
|
static void dump_printf(void *ctx, const char *fmt, va_list args)
|
|
{
|
|
}
|
|
|
|
static void try_skeleton_template()
|
|
{
|
|
Skeleton<test_core_extern> skel;
|
|
std::string prog_name;
|
|
int err;
|
|
LIBBPF_OPTS(bpf_object_open_opts, opts);
|
|
|
|
err = skel.open(&opts);
|
|
if (err) {
|
|
fprintf(stderr, "Skeleton open failed: %d\n", err);
|
|
return;
|
|
}
|
|
|
|
skel->data->kern_ver = 123;
|
|
skel->data->int_val = skel->data->ushort_val;
|
|
|
|
err = skel.load();
|
|
if (err) {
|
|
fprintf(stderr, "Skeleton load failed: %d\n", err);
|
|
return;
|
|
}
|
|
|
|
if (!skel->kconfig->CONFIG_BPF_SYSCALL)
|
|
fprintf(stderr, "Seems like CONFIG_BPF_SYSCALL isn't set?!\n");
|
|
|
|
err = skel.attach();
|
|
if (err) {
|
|
fprintf(stderr, "Skeleton attach failed: %d\n", err);
|
|
return;
|
|
}
|
|
|
|
prog_name = bpf_program__name(skel->progs.handle_sys_enter);
|
|
if (prog_name != "handle_sys_enter")
|
|
fprintf(stderr, "Unexpected program name: %s\n", prog_name.c_str());
|
|
|
|
bpf_link__destroy(skel->links.handle_sys_enter);
|
|
skel->links.handle_sys_enter = bpf_program__attach(skel->progs.handle_sys_enter);
|
|
|
|
skel.detach();
|
|
|
|
/* destructor will destory underlying skeleton */
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
struct btf_dump_opts opts = { };
|
|
struct test_core_extern *skel;
|
|
struct btf *btf;
|
|
|
|
try_skeleton_template();
|
|
|
|
/* libbpf.h */
|
|
libbpf_set_print(NULL);
|
|
|
|
/* bpf.h */
|
|
bpf_prog_get_fd_by_id(0);
|
|
|
|
/* btf.h */
|
|
btf = btf__new(NULL, 0);
|
|
if (!libbpf_get_error(btf))
|
|
btf_dump__new(btf, dump_printf, nullptr, &opts);
|
|
|
|
/* BPF skeleton */
|
|
skel = test_core_extern__open_and_load();
|
|
test_core_extern__destroy(skel);
|
|
|
|
std::cout << "DONE!" << std::endl;
|
|
|
|
return 0;
|
|
}
|