ARC: add missing bits for better BPF support
Subsystems (2)
v2 cover ARC: add missing bits for better BPF support
Hi Vineet and all,
Here is the second revision of the patch series implementing the following two features for ARC:
- HAVE_REGS_AND_STACK_ACCESS_API
- HAVE_SYSCALL_TRACEPOINTS
Adding these features enables more BPF programs for ARC kernels, including KPROBE, TRACEPOINT, PERF_EVENT program types.
Regards,
Sergey
v1 -> v2:
- drop path with uapi for BPF_PROG_TYPE_PERF_EVENT program type: send it via bpf mailing list
- add patch with ARCv2 changes for kprobe disasm
Sergey Matyukevich (4):
ARC: enable HAVE_REGS_AND_STACK_ACCESS_API feature
ARC: entry: fix syscall_trace_exit argument
ARC: implement syscall tracepoints
ARC: disasm: handle ARCv2 case in kprobe get/set functions
arch/arc/Kconfig | 2 + arch/arc/include/asm/ptrace.h | 27 ++++++ arch/arc/include/asm/syscall.h | 2 + arch/arc/include/asm/thread_info.h | 5 +- arch/arc/kernel/disasm.c | 64 ++++++++++++- arch/arc/kernel/entry.S | 13 +-- arch/arc/kernel/ptrace.c | 140 ++++++++++++++++++++++++++++- 7 files changed, 241 insertions(+), 12 deletions(-)
Signature · 7 lines
2.35.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
PATCH v2 1/4 ARC: enable HAVE_REGS_AND_STACK_ACCESS_API feature
From: Sergey Matyukevich <[email protected]>
Enable HAVE_REGS_AND_STACK_ACCESS_API feature for ARC architecture, including ARCcompact and ARCv2 flavors. Add supporting functions and defines.
--- arch/arc/Kconfig | 1 + arch/arc/include/asm/ptrace.h | 27 ++++++++ arch/arc/kernel/ptrace.c | 119 ++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+)
arch/arc/Kconfig +1 -0
@@ -36,6 +36,7 @@ config ARC select HAVE_KERNEL_LZMA select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_MOD_ARCH_SPECIFIC select HAVE_PERF_EVENTS select IRQ_DOMAIN
arch/arc/include/asm/ptrace.h +27 -0
@@ -8,6 +8,7 @@#define __ASM_ARC_PTRACE_H#include <uapi/asm/ptrace.h> +#include <linux/compiler.h> #ifndef __ASSEMBLY__
@@ -54,6 +55,9 @@ struct pt_regs {unsigned long user_r25; }; + +#define MAX_REG_OFFSET offsetof(struct pt_regs, user_r25) +#else struct pt_regs {
@@ -102,6 +106,8 @@ struct pt_regs { unsigned long status32; }; +#define MAX_REG_OFFSET offsetof(struct pt_regs, status32) +#endif /* Callee saved registers - need to be saved only when you are scheduled out */
@@ -154,6 +160,27 @@ static inline void instruction_pointer_set(struct pt_regs *regs, {instruction_pointer (regs) = val; } + +static inline unsigned long kernel_stack_pointer (struct pt_regs *regs) +{ +return regs->sp; +} + +extern int regs_query_register_offset (const char *name); +extern const char *regs_query_register_name (unsigned int offset); +extern bool regs_within_kernel_stack (struct pt_regs *regs,unsigned long addr); +extern unsigned long regs_get_kernel_stack_nth (struct pt_regs *regs, +unsigned int n); + +static inline unsigned long regs_get_register (struct pt_regs *regs, +unsigned int offset) +{ +if (unlikely (offset >MAX_REG_OFFSET )) +return 0 ; + +return *(unsigned long *)((unsigned long )regs + offset); +} +#endif /* !__ASSEMBLY__ */ #endif /* __ASM_PTRACE_H */
arch/arc/kernel/ptrace.c +119 -0
128 lines not on this page · raw message
Signature · 7 lines
2.35.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
PATCH v2 2/4 ARC: entry: fix syscall_trace_exit argument
In reply to Sergey MatyukevichFrom: Sergey Matyukevich <[email protected]>
Function syscall_trace_exit expects pointer to pt_regs. However r0 is also used to keep syscall return value. Restore pointer to pt_regs before calling syscall_trace_exit.
--- arch/arc/kernel/entry.S | 1 + 1 file changed, 1 insertion(+)
arch/arc/kernel/entry.S +1 -0
@@ -196,6 +196,7 @@ tracesys_exit: st r0, [sp, PT_r0] ; sys call return value in pt_regs ;POST Sys Call Ptrace Hook + mov r0, sp ; pt_regs needed bl @syscall_trace_exit b ret_from_exception ; NOT ret_from_system_call at is saves r0 which ; we'd done before calling post hook above
Signature · 7 lines
2.35.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Vineet Gupta
maintainerRe: [PATCH v2 2/4] ARC: entry: fix syscall_trace_exit argument
Quoted 7 lines · Sergey Matyukevich
From: Sergey Matyukevich<[email protected]>
Function
syscall_trace_exitexpects pointer topt_regs. However r0 is also used to keep syscall return value. Restore pointer topt_regsbefore callingsyscall_trace_exit.Signed-off-by Sergey Matyukevich<[email protected]>
This is independent fix and worth stable backport, So I'll apply it to for-curr, rest of the pile goes for next release.
-Vineet
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
PATCH v2 3/4 ARC: implement syscall tracepoints
In reply to Sergey MatyukevichFrom: Sergey Matyukevich <[email protected]>
Implement all the bits required to support HAVE_SYSCALL_TRACEPOINTS according to Documentation/trace/ftrace-design.rst.
--- arch/arc/Kconfig | 1 + arch/arc/include/asm/syscall.h | 2 ++ arch/arc/include/asm/thread_info.h | 5 ++++- arch/arc/kernel/entry.S | 12 ++++++------ arch/arc/kernel/ptrace.c | 21 ++++++++++++++++++--- 5 files changed, 31 insertions(+), 10 deletions(-)
arch/arc/Kconfig +1 -0
@@ -39,6 +39,7 @@ config ARC select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_MOD_ARCH_SPECIFIC select HAVE_PERF_EVENTS + select HAVE_SYSCALL_TRACEPOINTS select IRQ_DOMAIN select MODULES_USE_ELF_RELA select OF
arch/arc/include/asm/syscall.h +2 -0
@@ -12,6 +12,8 @@#include <asm/unistd.h> #include <asm/ptrace.h> /* in_syscall() */ +extern void *sys_call_table[]; +static inline long syscall_get_nr (struct task_struct *task,struct pt_regs *regs) {
arch/arc/include/asm/thread_info.h +4 -1
@@ -78,9 +78,9 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void)#define TIF_SYSCALL_AUDIT 4/* syscall auditing active */ #define TIF_NOTIFY_SIGNAL 5/* signal notifications exist */ #define TIF_SYSCALL_TRACE 15/* syscall trace active */ -/* true if poll_idle() is polling TIF_NEED_RESCHED */ #define TIF_MEMDIE 16 +#define TIF_SYSCALL_TRACEPOINT 17/* syscall tracepoint instrumentation */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
@@ -89,11 +89,14 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void)#define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)#define _TIF_NOTIFY_SIGNAL (1<<TIF_NOTIFY_SIGNAL)#define _TIF_MEMDIE (1<<TIF_MEMDIE) +#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)/* work to do on interrupt/exception return */ #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \ _TIF_NOTIFY_RESUME | _TIF_NOTIFY_SIGNAL) +#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT) +/* * _TIF_ALLWORK_MASK includes SYSCALL_TRACE, but we don't need it. * SYSCALL_TRACE is anyway separately/unconditionally tested right after a
arch/arc/kernel/entry.S +6 -6
@@ -29,8 +29,8 @@ ENTRY(sys_clone_wrapper) DISCARD_CALLEE_SAVED_USER GET_CURR_THR_INFO_FLAGS r10 - btst r10, TIF_SYSCALL_TRACE - bnz tracesys_exit + and.f 0, r10, _TIF_SYSCALL_WORK + bnz tracesys_exit b .Lret_from_system_call END(sys_clone_wrapper)
@@ -41,8 +41,8 @@ ENTRY(sys_clone3_wrapper) DISCARD_CALLEE_SAVED_USER GET_CURR_THR_INFO_FLAGS r10 - btst r10, TIF_SYSCALL_TRACE - bnz tracesys_exit + and.f 0, r10, _TIF_SYSCALL_WORK + bnz tracesys_exit b .Lret_from_system_call END(sys_clone3_wrapper)
@@ -247,8 +247,8 @@ ENTRY(EV_Trap) ; If syscall tracing ongoing, invoke pre-post-hooks GET_CURR_THR_INFO_FLAGS r10 - btst r10, TIF_SYSCALL_TRACE - bnz tracesys ; this never comes back + and.f 0, r10, _TIF_SYSCALL_WORK + bnz tracesys ; this never comes back ;============ Normal syscall case
arch/arc/kernel/ptrace.c +18 -3
@@ -9,6 +9,9 @@#include <linux/unistd.h> #include <linux/elf.h> +#define CREATE_TRACE_POINTS +#include <trace/events/syscalls.h> +struct pt_regs_offset {const char *name;int offset;
@@ -340,15 +343,27 @@ long arch_ptrace(struct task_struct *child, long request, asmlinkage int syscall_trace_entry(struct pt_regs *regs) { -if (ptrace_report_syscall_entry (regs)) -return ULONG_MAX ; +if (test_thread_flag (TIF_SYSCALL_TRACE )) +if (ptrace_report_syscall_entry (regs)) +return ULONG_MAX ; + +#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS +if (test_thread_flag (TIF_SYSCALL_TRACEPOINT )) +trace_sys_enter (regs,syscall_get_nr (current, regs)); +#endif return regs->r8; } asmlinkage void syscall_trace_exit(struct pt_regs *regs) { -ptrace_report_syscall_exit (regs,0 ); +if (test_thread_flag (TIF_SYSCALL_TRACE )) +ptrace_report_syscall_exit (regs,0 ); + +#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS +if (test_thread_flag (TIF_SYSCALL_TRACEPOINT )) +trace_sys_exit (regs,regs_return_value (regs)); +#endif }int regs_query_register_offset (const char *name)
Signature · 7 lines
2.35.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
PATCH v2 4/4 ARC: disasm: handle ARCv2 case in kprobe get/set functions
In reply to Sergey MatyukevichFrom: Sergey Matyukevich <[email protected]>
Current implementation of get_reg/set_reg implies ARCompact layout of pt_regs structure. Meanwhile pt_regs structure differs between ARCompact and ARCv2. Update those functions to handle ARCv2.
--- arch/arc/kernel/disasm.c | 64 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-)
arch/arc/kernel/disasm.c +62 -2
@@ -434,14 +434,31 @@ long __kprobes get_reg(int reg, struct pt_regs *regs, {long *p; +#if defined(CONFIG_ISA_ARCOMPACT )if (reg <=12 ) { p = ®s->r0;return p[-reg]; } +#else /* CONFIG_ISA_ARCV2 */ +if (reg <=11 ) { + p = ®s->r0; +return p[reg]; + } +if (reg ==12 ) +return regs->r12; +if (reg ==30 ) +return regs->r30; +#ifdef CONFIG_ARC_HAS_ACCL_REGS +if (reg ==58 ) +return regs->r58; +if (reg ==59 ) +return regs->r59; +#endif +#endif if (cregs && (reg <=25 )) { p = &cregs->r13; -return p[13 -reg]; +return p[13 - reg]; }if (reg ==26 )
@@ -461,6 +478,7 @@ void __kprobes set_reg(int reg, long val, struct pt_regs *regs, {long *p; +#if defined(CONFIG_ISA_ARCOMPACT )switch (reg) { case 0 ... 12: p = ®s->r0;
@@ -469,7 +487,37 @@ void __kprobes set_reg(int reg, long val, struct pt_regs *regs, case 13 ... 25:if (cregs) { p = &cregs->r13; - p[13 -reg] = val; + p[13 - reg] = val; + } +break ; +case 26 : + regs->gp = val; +break ; +case 27 : + regs->fp = val; +break ; +case 28 : + regs->sp = val; +break ; +case 31 : + regs->blink = val; +break ; +default : +break ; + } +#else /* CONFIG_ISA_ARCV2 */ +switch (reg) { + case 0 ... 11: + p = ®s->r0; + p[reg] = val; +break ; +case 12 : + regs->r12 = val; +break ; + case 13 ... 25: +if (cregs) { + p = &cregs->r13; + p[13 - reg] = val; }break ;case 26 :
@@ -481,12 +529,24 @@ void __kprobes set_reg(int reg, long val, struct pt_regs *regs,case 28 : regs->sp = val;break ; +case 30 : + regs->r30 = val; +break ;case 31 : regs->blink = val;break ; +#ifdef CONFIG_ARC_HAS_ACCL_REGS +case 58 : + regs->r58 = val; +break ; +case 59 : + regs->r59 = val; +break ; +#endif default : break; } +#endif }/*
Signature · 7 lines
2.35.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Vineet Gupta
maintainerQuoted 7 lines · Sergey Matyukevich
Hi Vineet and all,
Here is the second revision of the patch series implementing the following two features for ARC:
-HAVE_REGS_AND_STACK_ACCESS_API
-HAVE_SYSCALL_TRACEPOINTS
Quoted 5 lines
Adding these features enables more BPF programs for ARC kernels, including KPROBE, TRACEPOINT,
PERF_EVENTprogram types.Regards,
Sergey
Applied !
Thx,
-Vineet
Quoted 12 lines
v1 -> v2:
- drop path with uapi for
BPF_PROG_TYPE_PERF_EVENTprogram type: send it via bpf mailing list
- add patch with ARCv2 changes for kprobe disasmSergey Matyukevich (4):
ARC: enableHAVE_REGS_AND_STACK_ACCESS_APIfeature
ARC: entry: fixsyscall_trace_exitargument
ARC: implement syscall tracepoints
ARC: disasm: handle ARCv2 case in kprobe get/set functions
Quoted 9 lines
arch/arc/Kconfig | 2 + arch/arc/include/asm/ptrace.h | 27 ++++++ arch/arc/include/asm/syscall.h | 2 + arch/arc/include/asm/thread_info.h | 5 +- arch/arc/kernel/disasm.c | 64 ++++++++++++- arch/arc/kernel/entry.S | 13 +-- arch/arc/kernel/ptrace.c | 140 ++++++++++++++++++++++++++++- 7 files changed, 241 insertions(+), 12 deletions(-)
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc