Re: Linux 4.15-rc3 (uml + bpf_perf_event.h)

Richard Weinberger
2017-12-11T18:49:19Z

Am Montag, 11. Dezember 2017, 11:19:54 CET schrieb Daniel Borkmann:
> Hi Randy, hi Richard, [ +Hendrik for c895f6f703ad7dd2f ]
>
> On 12/11/2017 09:32 AM, Richard Weinberger wrote:
> > Randy,
> >
> > Am Montag, 11. Dezember 2017, 03:42:12 CET schrieb Randy Dunlap:
> >> On 12/10/2017 06:08 PM, Linus Torvalds wrote:
> >>> Another week, another rc.
> >>
> >> um (uml) won't build on i386 or x86_64:
> >> CC init/main.o
> >>
> >> In file included from ../include/linux/perf_event.h:18:0,
> >>
> >> from ../include/linux/trace_events.h:10,
> >> from ../include/trace/syscall.h:7,
> >> from ../include/linux/syscalls.h:82,
> >>
> >> from ../init/main.c:20:
> >> ../include/uapi/linux/bpf_perf_event.h:11:32: fatal error:
> >> asm/bpf_perf_event.h: No such file or directory #include
> >> <asm/bpf_perf_event.h>
> >>
> >> ^
> >>
> >> compilation terminated.
> >> ../scripts/Makefile.build:310: recipe for target 'init/main.o' failed
> >
> > How do you trigger that build failure?
> > Can you share your .config?
>
> Hmm, too bad kbuild bot doesn't catch issues on uml. I'm not too familiar
> with uml, but looks like it's the only special case where there's no
> arch/um/include/uapi/asm/. What is the usual convention to pull in such
> headers in this case? Something like the below, would that fix it for you?
>
> Thanks for your help,
> Daniel
>
> arch/um/include/asm/bpf_perf_event.h | 1 +
> include/asm-generic/bpf_perf_event.h | 1 +
> 2 files changed, 2 insertions(+)
> create mode 100644 arch/um/include/asm/bpf_perf_event.h
> create mode 100644 include/asm-generic/bpf_perf_event.h
>
> diff --git a/arch/um/include/asm/bpf_perf_event.h
> b/arch/um/include/asm/bpf_perf_event.h new file mode 100644
> index 0000000..3097758
> --- /dev/null
> +++ b/arch/um/include/asm/bpf_perf_event.h
> @@ -0,0 +1 @@
> +#include <asm-generic/bpf_perf_event.h>
> diff --git a/include/asm-generic/bpf_perf_event.h
> b/include/asm-generic/bpf_perf_event.h new file mode 100644
> index 0000000..67112e5
> --- /dev/null
> +++ b/include/asm-generic/bpf_perf_event.h
> @@ -0,0 +1 @@
> +#include <uapi/asm-generic/bpf_perf_event.h>

Hmm, what about this?

diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index 50a32c33d729..fb35ec000433 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -27,3 +27,4 @@ generic-y += trace_clock.h
generic-y += word-at-a-time.h
generic-y += xor.h
generic-y += kprobes.h
+generic-y += bpf_perf_event.h

--
sigma star gmbh - Eduard-Bodem-Gasse 6 - 6020 Innsbruck - Austria
ATU66964118 - FN 374287y