This is a note to let you know that I've just added the patch titled

bpf: fix build issues on um due to mising bpf_perf_event.h

to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git%3Ba=su...

The filename of the patch is: bpf-fix-build-issues-on-um-due-to-mising-bpf_perf_event.h.patch and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.

From ab95477e7cb35557ecfc837687007b646bab9a9f Mon Sep 17 00:00:00 2001

From: Daniel Borkmann daniel@iogearbox.net Date: Tue, 12 Dec 2017 02:25:31 +0100 Subject: bpf: fix build issues on um due to mising bpf_perf_event.h

From: Daniel Borkmann daniel@iogearbox.net

commit ab95477e7cb35557ecfc837687007b646bab9a9f upstream.

[ Note, this is a Git cherry-pick of the following commit:

a23f06f06dbe ("bpf: fix build issues on um due to mising bpf_perf_event.h")

... for easier x86 PTI code testing and back-porting. ]

Since c895f6f703ad ("bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type") 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> [...]

Lets add missing bpf_perf_event.h also to um arch. This seems to be the only one still missing.

Fixes: c895f6f703ad ("bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type") Reported-by: Randy Dunlap rdunlap@infradead.org Suggested-by: Richard Weinberger richard@sigma-star.at Signed-off-by: Daniel Borkmann daniel@iogearbox.net Tested-by: Randy Dunlap rdunlap@infradead.org Cc: Hendrik Brueckner brueckner@linux.vnet.ibm.com Cc: Richard Weinberger richard@sigma-star.at Acked-by: Alexei Starovoitov ast@kernel.org Acked-by: Richard Weinberger richard@nod.at Signed-off-by: Alexei Starovoitov ast@kernel.org Signed-off-by: Ingo Molnar mingo@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org

--- arch/um/include/asm/Kbuild | 1 + 1 file changed, 1 insertion(+)

--- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -1,4 +1,5 @@ generic-y += barrier.h +generic-y += bpf_perf_event.h generic-y += bug.h generic-y += clkdev.h generic-y += current.h

Patches currently in stable-queue which might be from daniel@iogearbox.net are

queue-4.14/bpf-fix-build-issues-on-um-due-to-mising-bpf_perf_event.h.patch