| Message ID | 20221231100757.3177034-1-hengqi.chen@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 00883922ab404c0fc921709d8c2cec86f49c32f2 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] libbpf: Add LoongArch support to bpf_tracing.h | expand |
LGTM, I will queue this patch for loongarch-next if no one has objections. Thank you. On Sat, Dec 31, 2022 at 6:08 PM Hengqi Chen <hengqi.chen@gmail.com> wrote: > > Add PT_REGS macros for LoongArch ([0]). > > [0]: https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html > > Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com> > --- > tools/lib/bpf/bpf_tracing.h | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h > index 9c1b1689068d..bdb0f6b5be84 100644 > --- a/tools/lib/bpf/bpf_tracing.h > +++ b/tools/lib/bpf/bpf_tracing.h > @@ -32,6 +32,9 @@ > #elif defined(__TARGET_ARCH_arc) > #define bpf_target_arc > #define bpf_target_defined > +#elif defined(__TARGET_ARCH_loongarch) > + #define bpf_target_loongarch > + #define bpf_target_defined > #else > > /* Fall back to what the compiler says */ > @@ -62,6 +65,9 @@ > #elif defined(__arc__) > #define bpf_target_arc > #define bpf_target_defined > +#elif defined(__loongarch__) > + #define bpf_target_loongarch > + #define bpf_target_defined > #endif /* no compiler target */ > > #endif > @@ -258,6 +264,23 @@ struct pt_regs___arm64 { > /* arc does not select ARCH_HAS_SYSCALL_WRAPPER. */ > #define PT_REGS_SYSCALL_REGS(ctx) ctx > > +#elif defined(bpf_target_loongarch) > + > +/* https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html */ > + > +#define __PT_PARM1_REG regs[4] > +#define __PT_PARM2_REG regs[5] > +#define __PT_PARM3_REG regs[6] > +#define __PT_PARM4_REG regs[7] > +#define __PT_PARM5_REG regs[8] > +#define __PT_RET_REG regs[1] > +#define __PT_FP_REG regs[22] > +#define __PT_RC_REG regs[4] > +#define __PT_SP_REG regs[3] > +#define __PT_IP_REG csr_era > +/* loongarch does not select ARCH_HAS_SYSCALL_WRAPPER. */ > +#define PT_REGS_SYSCALL_REGS(ctx) ctx > + > #endif > > #if defined(bpf_target_defined) > -- > 2.31.1 >
On 1/3/23 7:53 AM, Huacai Chen wrote: > LGTM, I will queue this patch for loongarch-next if no one has > objections. Thank you. To avoid potential merge conflicts for the next dev cycle, any objections if you could Ack it and we'd take it via bpf-next tree instead? Thanks, Daniel
OK, bpf-next is also fine for me. Acked-by: Huacai Chen <chenhuacai@loongson.cn> On Tue, Jan 3, 2023 at 8:28 PM Daniel Borkmann <daniel@iogearbox.net> wrote: > > On 1/3/23 7:53 AM, Huacai Chen wrote: > > LGTM, I will queue this patch for loongarch-next if no one has > > objections. Thank you. > > To avoid potential merge conflicts for the next dev cycle, any objections if > you could Ack it and we'd take it via bpf-next tree instead? > > Thanks, > Daniel
Hello: This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <daniel@iogearbox.net>: On Sat, 31 Dec 2022 18:07:57 +0800 you wrote: > Add PT_REGS macros for LoongArch ([0]). > > [0]: https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html > > Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com> > --- > tools/lib/bpf/bpf_tracing.h | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > [...] Here is the summary with links: - [bpf-next] libbpf: Add LoongArch support to bpf_tracing.h https://git.kernel.org/bpf/bpf-next/c/00883922ab40 You are awesome, thank you!
diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h index 9c1b1689068d..bdb0f6b5be84 100644 --- a/tools/lib/bpf/bpf_tracing.h +++ b/tools/lib/bpf/bpf_tracing.h @@ -32,6 +32,9 @@ #elif defined(__TARGET_ARCH_arc) #define bpf_target_arc #define bpf_target_defined +#elif defined(__TARGET_ARCH_loongarch) + #define bpf_target_loongarch + #define bpf_target_defined #else /* Fall back to what the compiler says */ @@ -62,6 +65,9 @@ #elif defined(__arc__) #define bpf_target_arc #define bpf_target_defined +#elif defined(__loongarch__) + #define bpf_target_loongarch + #define bpf_target_defined #endif /* no compiler target */ #endif @@ -258,6 +264,23 @@ struct pt_regs___arm64 { /* arc does not select ARCH_HAS_SYSCALL_WRAPPER. */ #define PT_REGS_SYSCALL_REGS(ctx) ctx +#elif defined(bpf_target_loongarch) + +/* https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html */ + +#define __PT_PARM1_REG regs[4] +#define __PT_PARM2_REG regs[5] +#define __PT_PARM3_REG regs[6] +#define __PT_PARM4_REG regs[7] +#define __PT_PARM5_REG regs[8] +#define __PT_RET_REG regs[1] +#define __PT_FP_REG regs[22] +#define __PT_RC_REG regs[4] +#define __PT_SP_REG regs[3] +#define __PT_IP_REG csr_era +/* loongarch does not select ARCH_HAS_SYSCALL_WRAPPER. */ +#define PT_REGS_SYSCALL_REGS(ctx) ctx + #endif #if defined(bpf_target_defined)
Add PT_REGS macros for LoongArch ([0]). [0]: https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com> --- tools/lib/bpf/bpf_tracing.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.31.1