netdev - Re: [PATCH bpf-next] tools/bpf: use proper type and uapi perf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <2CAE26DD-8DF9-4B50-9D34-79469811D345@fb.com>
Date:   Tue, 9 Oct 2018 23:21:30 +0000
From:   Song Liu <songliubraving@...com>
To:     Yonghong Song <yhs@...com>
CC:     Alexei Starovoitov <ast@...com>,
        "daniel@...earbox.net" <daniel@...earbox.net>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        Kernel Team <Kernel-team@...com>
Subject: Re: [PATCH bpf-next] tools/bpf: use proper type and uapi perf_event.h
 header for libbpf



> On Oct 9, 2018, at 4:14 PM, Yonghong Song <yhs@...com> wrote:
> 
> 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@...com>

Acked-by: Song Liu <songliubraving@...com>

> ---
> tools/lib/bpf/Makefile | 2 +-
> tools/lib/bpf/libbpf.c | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
> index 6ad27257fd67..79d84413ddf2 100644
> --- a/tools/lib/bpf/Makefile
> +++ b/tools/lib/bpf/Makefile
> @@ -69,7 +69,7 @@ FEATURE_USER = .libbpf
> FEATURE_TESTS = libelf libelf-mmap bpf reallocarray
> 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)
> 
> check_feat := 1
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index ceb918c14d80..176cf5523728 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -19,7 +19,6 @@
> #include <unistd.h>
> #include <fcntl.h>
> #include <errno.h>
> -#include <perf-sys.h>
> #include <asm/unistd.h>
> #include <linux/err.h>
> #include <linux/kernel.h>
> @@ -27,6 +26,7 @@
> #include <linux/btf.h>
> #include <linux/list.h>
> #include <linux/limits.h>
> +#include <linux/perf_event.h>
> #include <sys/stat.h>
> #include <sys/types.h>
> #include <sys/vfs.h>
> @@ -169,7 +169,7 @@ static LIST_HEAD(bpf_objects_list);
> 
> struct bpf_object {
> 	char license[64];
> -	u32 kern_version;
> +	__u32 kern_version;
> 
> 	struct bpf_program *programs;
> 	size_t nr_programs;
> @@ -540,7 +540,7 @@ static int
> bpf_object__init_kversion(struct bpf_object *obj,
> 			  void *data, size_t size)
> {
> -	u32 kver;
> +	__u32 kver;
> 
> 	if (size != sizeof(kver)) {
> 		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
> load_program(enum bpf_prog_type type, enum bpf_attach_type expected_attach_type,
> 	     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;
> 	char *cp, errmsg[STRERR_BUFSIZE];
> -- 
> 2.17.1
>