lkml.org 
[lkml]   [2023]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/1] perf bpf: Avoid build breakage with libbpf < 0.8.0 + LIBBPF_DYNAMIC=1
    In 746bd29e348f99b4 ("perf build: Use tools/lib headers from install
    path") we stopped having the tools/lib/ directory from the kernel
    sources in the header include path unconditionally, which breaks the
    build on systems with older versions of libbpf-devel, in this case 0.7.0
    as some of the structures and function declarations present in the newer
    version of libbpf included in the kernel sources (tools/lib/bpf) are not
    anymore used, just the ones in the system libbpf.

    So instead of trying to provide alternative functions when the
    libbpf-bpf_program__set_insns feature test fails, fail a
    LIBBPF_DYNAMIC=1 build (requesting the use of the system's libbpf) and
    emit this build error message:

    $ make LIBBPF_DYNAMIC=1 -C tools/perf
    Makefile.config:593: *** Error: libbpf devel library needs to be >= 0.8.0 to build with LIBBPF_DYNAMIC, update or build statically with the version that comes with the kernel sources. Stop.
    $

    For v6.3 these tests will be revamped and we'll require libbpf 1.0 as a
    minimal version for using LIBBPF_DYNAMIC=1, most distros should have it
    by now or at v6.3 time.

    Fixes: 746bd29e348f99b4 ("perf build: Use tools/lib headers from install path")
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Mike Leach <mike.leach@linaro.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lore.kernel.org/lkml/CAP-5=fVa51_URGsdDFVTzpyGmdDRj_Dj2EKPuDHNQ0BYgMSzUA@mail.gmail.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/Makefile.config | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
    index 9962ae23ab8c5868..5b87846759036f6f 100644
    --- a/tools/perf/Makefile.config
    +++ b/tools/perf/Makefile.config
    @@ -589,6 +589,8 @@ ifndef NO_LIBELF
    $(call feature_check,libbpf-bpf_program__set_insns)
    ifeq ($(feature-libbpf-bpf_program__set_insns), 1)
    CFLAGS += -DHAVE_LIBBPF_BPF_PROGRAM__SET_INSNS
    + else
    + dummy := $(error Error: libbpf devel library needs to be >= 0.8.0 to build with LIBBPF_DYNAMIC, update or build statically with the version that comes with the kernel sources);
    endif
    $(call feature_check,libbpf-btf__raw_data)
    ifeq ($(feature-libbpf-btf__raw_data), 1)
    --
    2.39.0
    \
     
     \ /
      Last update: 2023-03-26 23:34    [W:4.018 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site