| Message ID | 20181206092701.4153-1-sandipan@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a6460b03f945ee216dbf42a0d9ee78d52fd470c2 |
| Headers | show |
| Series | [bpf] bpf: powerpc: fix broken uapi for BPF_PROG_TYPE_PERF_EVENT | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/build-ppc64le | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64be | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64e | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-pmac32 | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/checkpatch | fail | total: 1 errors, 1 warnings, 1 checks, 24 lines checked |
On Thu, Dec 06, 2018 at 02:57:01PM +0530, Sandipan Das wrote: > Now that there are different variants of pt_regs for userspace and > kernel, the uapi for the BPF_PROG_TYPE_PERF_EVENT program type must > be changed by exporting the user_pt_regs structure instead of the > pt_regs structure that is in-kernel only. > > Fixes: 002af9391bfb ("powerpc: Split user/kernel definitions of struct pt_regs") > Signed-off-by: Sandipan Das <sandipan@linux.ibm.com> Thanks! Applied to bpf tree.
Alexei Starovoitov <alexei.starovoitov@gmail.com> writes: > On Thu, Dec 06, 2018 at 02:57:01PM +0530, Sandipan Das wrote: >> Now that there are different variants of pt_regs for userspace and >> kernel, the uapi for the BPF_PROG_TYPE_PERF_EVENT program type must >> be changed by exporting the user_pt_regs structure instead of the >> pt_regs structure that is in-kernel only. >> >> Fixes: 002af9391bfb ("powerpc: Split user/kernel definitions of struct pt_regs") >> Signed-off-by: Sandipan Das <sandipan@linux.ibm.com> > > Thanks! Applied to bpf tree. I already have this in the fixes branch of the powerpc tree. I don't mind if you take it also, git should probably handle the merge OK. cheers
diff --git a/arch/powerpc/include/asm/perf_event.h b/arch/powerpc/include/asm/perf_event.h index 8bf1b6351716..16a49819da9a 100644 --- a/arch/powerpc/include/asm/perf_event.h +++ b/arch/powerpc/include/asm/perf_event.h @@ -26,6 +26,8 @@ #include <asm/ptrace.h> #include <asm/reg.h> +#define perf_arch_bpf_user_pt_regs(regs) ®s->user_regs + /* * Overload regs->result to specify whether we should use the MSR (result * is zero) or the SIAR (result is non zero). diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index a658091a19f9..3712152206f3 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,7 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -generic-y += bpf_perf_event.h generic-y += param.h generic-y += poll.h generic-y += resource.h diff --git a/arch/powerpc/include/uapi/asm/bpf_perf_event.h b/arch/powerpc/include/uapi/asm/bpf_perf_event.h new file mode 100644 index 000000000000..b551b741653d --- /dev/null +++ b/arch/powerpc/include/uapi/asm/bpf_perf_event.h @@ -0,0 +1,9 @@ +/* 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__ */
Now that there are different variants of pt_regs for userspace and kernel, the uapi for the BPF_PROG_TYPE_PERF_EVENT program type must be changed by exporting the user_pt_regs structure instead of the pt_regs structure that is in-kernel only. Fixes: 002af9391bfb ("powerpc: Split user/kernel definitions of struct pt_regs") Signed-off-by: Sandipan Das <sandipan@linux.ibm.com> --- arch/powerpc/include/asm/perf_event.h | 2 ++ arch/powerpc/include/uapi/asm/Kbuild | 1 - arch/powerpc/include/uapi/asm/bpf_perf_event.h | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 arch/powerpc/include/uapi/asm/bpf_perf_event.h