Commit 195bd525 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 



Daniel Borkmann says:

====================
pull-request: bpf 2017-12-06

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Fixing broken uapi for BPF tracing programs for s390 and arm64
   architectures due to pt_regs being in-kernel only, and not part
   of uapi right now. A wrapper is added that exports pt_regs in
   an asm-generic way. For arm64 this maps to existing user_pt_regs
   structure and for s390 a user_pt_regs structure exporting the
   beginning of pt_regs is added and uapi-exported, thus fixing the
   BPF issues seen in perf (and BPF selftests), all from Hendrik.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a4abd7a8 037776e4

arch/alpha/include/uapi/asm/Kbuild

+2 −0
Original line number Diff line number Diff line 
# UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm



generic-y += bpf_perf_event.h

arch/arc/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm 


generic-y += auxvec.h

generic-y += bitsperlong.h

generic-y += bpf_perf_event.h

generic-y += errno.h

generic-y += fcntl.h

generic-y += ioctl.h

arch/arm/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ generated-y += unistd-oabi.h 
generated-y += unistd-eabi.h



generic-y += bitsperlong.h

generic-y += bpf_perf_event.h

generic-y += errno.h

generic-y += ioctl.h

generic-y += ipcbuf.h

arch/arm64/include/asm/perf_event.h

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define __ASM_PERF_EVENT_H



#include <asm/stack_pointer.h>

#include <asm/ptrace.h>



#define	ARMV8_PMU_MAX_COUNTERS	32

#define	ARMV8_PMU_COUNTER_MASK	(ARMV8_PMU_MAX_COUNTERS - 1)
@@ -79,6 +80,7 @@ struct pt_regs; 
extern unsigned long perf_instruction_pointer(struct pt_regs *regs);

extern unsigned long perf_misc_flags(struct pt_regs *regs);

#define perf_misc_flags(regs)	perf_misc_flags(regs)

#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs

#endif



#define perf_arch_fetch_caller_regs(regs, __ip) { \

arch/arm64/include/uapi/asm/bpf_perf_event.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__

#define _UAPI__ASM_BPF_PERF_EVENT_H__



#include <asm/ptrace.h>



typedef struct user_pt_regs bpf_user_pt_regs_t;



#endif /* _UAPI__ASM_BPF_PERF_EVENT_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE