Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a39cada7 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Daniel Borkmann
Browse files

arm64/bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type 



Correct the broken uapi for the BPF_PROG_TYPE_PERF_EVENT program type
by exporting the user_pt_regs structure instead of the pt_regs structure
that is in-kernel only.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Richter <tmricht@linux.vnet.ibm.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 466698e6

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__ */