• Ian Rogers's avatar
    perf build: Add ability to build with a generated vmlinux.h · b7a2d774
    Ian Rogers authored
    Commit a8874665 ("perf bpf skels: Stop using vmlinux.h generated
    from BTF, use subset of used structs + CO-RE") made it so that
    vmlinux.h was uncondtionally included from
    tools/perf/util/vmlinux.h. This change reverts part of that change (so
    that vmlinux.h is once again generated) and makes it so that the
    vmlinux.h used at build time is selected from the VMLINUX_H
    variable. By default the VMLINUX_H variable is set to the vmlinux.h
    added in change a8874665, but if GEN_VMLINUX_H=1 is passed on the
    build command line then the previous generation behavior kicks in.
    
    The build with GEN_VMLINUX_H=1 currently fails with:
    
        util/bpf_skel/lock_contention.bpf.c:419:8: error: redefinition of 'rq'
        struct rq {};
               ^
        /tmp/perf/util/bpf_skel/.tmp/../vmlinux.h:45630:8: note: previous definition is here
        struct rq {
               ^
        1 error generated.
    Signed-off-by: default avatarIan Rogers <irogers@google.com>
    Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
    Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
    Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
    Cc: James Clark <james.clark@arm.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Yang Jihong <yangjihong1@huawei.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Tiezhu Yang <yangtiezhu@loongson.cn>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: bpf@vger.kernel.org
    Link: https://lore.kernel.org/r/20230623041405.4039475-2-irogers@google.com
    [ Format the error message and add a comment for GEN_VMLINUX_H ]
    Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
    b7a2d774
vmlinux.h 3.84 KB