renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 14:43:58 +08:00
Code

tools/bpf: use proper type and uapi perf_event.h header for libbpf

Browse Source 
Use __u32 instead u32 in libbpf.c and also use
uapi perf_event.h instead of tools/perf/perf-sys.h.

Signed-off-by: Yonghong Song <yhs@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Yonghong Song 2018-10-09 16:14:47 -07:00 committed by Alexei Starovoitov
parent a0f99e6796
commit 438363c0fe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lib/bpf/Makefile
View File

@ -69,7 +69,7 @@ FEATURE_USER = .libbpf
FEATURE_TESTS = libelf libelf-mmap bpf reallocarray FEATURE_TESTS = libelf libelf-mmap bpf reallocarray
FEATURE_DISPLAY = libelf bpf FEATURE_DISPLAY = libelf bpf
INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi -I$(srctree)/tools/perf INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi
FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES) FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES)
check_feat := 1 check_feat := 1

8
tools/lib/bpf/libbpf.c
View File

@ -19,7 +19,6 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <perf-sys.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -27,6 +26,7 @@
#include <linux/btf.h> #include <linux/btf.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/perf_event.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/vfs.h> #include <sys/vfs.h>
@ -169,7 +169,7 @@ static LIST_HEAD(bpf_objects_list);
struct bpf_object { struct bpf_object {
char license[64]; char license[64];
u32 kern_version; __u32 kern_version;
struct bpf_program *programs; struct bpf_program *programs;
size_t nr_programs; size_t nr_programs;
@ -540,7 +540,7 @@ static int
bpf_object__init_kversion(struct bpf_object *obj, bpf_object__init_kversion(struct bpf_object *obj,
void *data, size_t size) void *data, size_t size)
{ {
u32 kver; __u32 kver;
if (size != sizeof(kver)) { if (size != sizeof(kver)) {
pr_warning("invalid kver section in %s\n", obj->path); pr_warning("invalid kver section in %s\n", obj->path);
@ -1295,7 +1295,7 @@ static int bpf_object__collect_reloc(struct bpf_object *obj)
static int static int
load_program(enum bpf_prog_type type, enum bpf_attach_type expected_attach_type, load_program(enum bpf_prog_type type, enum bpf_attach_type expected_attach_type,
const char *name, struct bpf_insn *insns, int insns_cnt, const char *name, struct bpf_insn *insns, int insns_cnt,
char *license, u32 kern_version, int *pfd, int prog_ifindex) char *license, __u32 kern_version, int *pfd, int prog_ifindex)
{ {
struct bpf_load_program_attr load_attr; struct bpf_load_program_attr load_attr;
char *cp, errmsg[STRERR_BUFSIZE]; char *cp, errmsg[STRERR_BUFSIZE];