netdev - Re: [PATCH bpf-next] bpftool: remove useless #include to <perf-sys.h> from map_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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <CAEf4BzYjer110+RfsHjoRRbVwKpzMQs=XY+qMTzZh9eHe5KiSw@mail.gmail.com>
Date:   Wed, 20 Oct 2021 10:48:03 -0700
From:   Andrii Nakryiko <andrii.nakryiko@...il.com>
To:     Quentin Monnet <quentin@...valent.com>
Cc:     Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Andrii Nakryiko <andrii@...nel.org>,
        Networking <netdev@...r.kernel.org>, bpf <bpf@...r.kernel.org>
Subject: Re: [PATCH bpf-next] bpftool: remove useless #include to <perf-sys.h>
 from map_perf_ring.c

On Wed, Oct 20, 2021 at 2:48 AM Quentin Monnet <quentin@...valent.com> wrote:
>
> The header is no longer needed since the event_pipe implementation
> was updated to rely on libbpf's perf_buffer. This makes bpftool free of
> dependencies to perf files, and we can update the Makefile accordingly.
>
> Fixes: 9b190f185d2f ("tools/bpftool: switch map event_pipe to libbpf's perf_buffer")
> Signed-off-by: Quentin Monnet <quentin@...valent.com>
> ---


Great, thanks. It's in bpf-next.

>  tools/bpf/bpftool/Makefile        | 3 +--
>  tools/bpf/bpftool/map_perf_ring.c | 1 -
>  2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
> index abcef1f72d65..098d762e111a 100644
> --- a/tools/bpf/bpftool/Makefile
> +++ b/tools/bpf/bpftool/Makefile
> @@ -73,8 +73,7 @@ CFLAGS += -DPACKAGE='"bpftool"' -D__EXPORTED_HEADERS__ \
>         -I$(LIBBPF_INCLUDE) \
>         -I$(srctree)/kernel/bpf/ \
>         -I$(srctree)/tools/include \
> -       -I$(srctree)/tools/include/uapi \
> -       -I$(srctree)/tools/perf
> +       -I$(srctree)/tools/include/uapi
>  CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"'
>  ifneq ($(EXTRA_CFLAGS),)
>  CFLAGS += $(EXTRA_CFLAGS)
> diff --git a/tools/bpf/bpftool/map_perf_ring.c b/tools/bpf/bpftool/map_perf_ring.c
> index 825f29f93a57..b98ea702d284 100644
> --- a/tools/bpf/bpftool/map_perf_ring.c
> +++ b/tools/bpf/bpftool/map_perf_ring.c
> @@ -22,7 +22,6 @@
>  #include <sys/syscall.h>
>
>  #include <bpf/bpf.h>
> -#include <perf-sys.h>
>
>  #include "main.h"
>
> --
> 2.30.2
>