csky: Use in_syscall & forget_syscall instead of r11_sig
[email protected]
maintainerPATCH 1/3 csky: Use in_syscall & forget_syscall instead of r11_sig
From: Guo Ren <[email protected]>
We could use regs->sr 16-24 bits to detect syscall: VEC_TRAP0 and r11_sig is no necessary for current implementation.
In this patch, we implement the in_syscall and forget_syscall which are inspired from arm & nds32, but csky pt_regs has no syscall_num element and we just set zero to regs->sr's vector-bits-field instead.
For ret_from_fork, current task was forked from parent which is in syscall progress and its regs->sr has been already setted with VEC_TRAP0. See:arch/csky/kernel/process.c: copy_thread()
--- arch/csky/abiv1/inc/abi/regdef.h | 2 -- arch/csky/abiv2/inc/abi/regdef.h | 2 -- arch/csky/include/asm/ptrace.h | 12 ++++++++++++ arch/csky/kernel/entry.S | 11 +---------- arch/csky/kernel/signal.c | 15 +++++++++------ 5 files changed, 22 insertions(+), 20 deletions(-)
arch/csky/abiv1/inc/abi/regdef.h +0 -2
@@ -5,8 +5,6 @@#define __ASM_CSKY_REGDEF_H#define syscallid r1 -#define r11_sig r11 -#define regs_syscallid (regs) regs->regs[9]/*
arch/csky/abiv2/inc/abi/regdef.h +0 -2
@@ -5,8 +5,6 @@#define __ASM_CSKY_REGDEF_H#define syscallid r7 -#define r11_sig r11 -#define regs_syscallid (regs) regs->regs[3]/*
arch/csky/include/asm/ptrace.h +12 -0
@@ -5,6 +5,8 @@#define __ASM_CSKY_PTRACE_H#include <uapi/asm/ptrace.h> +#include <asm/traps.h> +#include <linux/types.h> #ifndef __ASSEMBLY__
@@ -20,6 +22,16 @@#define instruction_pointer (regs) ((regs)->pc)#define profile_pc (regs) instruction_pointer(regs) +static inline bool in_syscall (struct pt_regs const *regs) +{ +return ((regs->sr >>16 ) &0xff ) ==VEC_TRAP0 ; +} + +static inline void forget_syscall (struct pt_regs *regs) +{ + regs->sr &= ~(0xff <<16 ); +} +static inline unsigned long regs_return_value (struct pt_regs *regs) {return regs->a0;
arch/csky/kernel/entry.S +1 -10
@@ -32,7 +32,6 @@ RD_MEH a1 psrset ee, ie jbsr do_page_fault - movi r11_sig, 0 /* r11 = 0, Not a syscall. */ jmpi ret_from_exception .endm
@@ -125,7 +124,6 @@ ENTRY(ret_from_fork) bmaski r10, THREAD_SHIFT andn r9, r10 ldw r8, (r9, TINFO_FLAGS) - movi r11_sig, 1 ANDI_R3 r8, (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_AUDIT) cmpnei r8, 0 bf 3f
@@ -160,12 +158,8 @@ exit_work: /* If thread_info->flag is empty, RESTORE_ALL */ cmpnei r8, 0 bf 1b - mov a1, sp mov a0, r8 - mov a2, r11_sig /* syscall? */ - btsti r8, TIF_SIGPENDING /* delivering a signal? */ - /* prevent further restarts(set r11 = 0) */ - clrt r11_sig + mov a1, sp jbsr do_notify_resume /* do signals */ br resume_userspace
@@ -175,13 +169,11 @@ work_resched: jmpi schedule ENTRY(sys_rt_sigreturn) - movi r11_sig, 0 jmpi do_rt_sigreturn ENTRY(csky_trap) SAVE_ALL EPC_KEEP psrset ee - movi r11_sig, 0 /* r11 = 0, Not a syscall. */ mov a0, sp /* Push Stack pointer arg */ jbsr trap_c /* Call C-level trap handler */ jmpi ret_from_exception
@@ -215,7 +207,6 @@ ENTRY(csky_get_tls) ENTRY(csky_irq) SAVE_ALL EPC_KEEP psrset ee - movi r11_sig, 0 /* r11 = 0, Not a syscall. */ #ifdef CONFIG_PREEMPT mov r9, sp /* Get current stack pointer */
arch/csky/kernel/signal.c +9 -6
@@ -224,7 +224,7 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs)* that the kernel can handle, and then we build all the user-level signal * handling stack-frames in one go after that. */ -static void do_signal (struct pt_regs *regs,int syscall) +static void do_signal (struct pt_regs *regs) {unsigned int retval =0 , continue_addr =0 , restart_addr =0 ;struct ksignal ksig;
@@ -241,7 +241,9 @@ static void do_signal(struct pt_regs *regs, int syscall)/* * If we were from a system call, check for system call restarting... */ -if (syscall) { +if (in_syscall (regs)) { +forget_syscall (regs); + continue_addr = regs->pc;#if defined(__CSKYABIV2__) restart_addr = continue_addr -4 ;
@@ -249,7 +251,6 @@ static void do_signal(struct pt_regs *regs, int syscall) restart_addr = continue_addr -2 ;#endif retval = regs->a0; -/* * Prepare for system call restart. We do this here so that a * debugger will see the already changed.
@@ -304,7 +305,9 @@ static void do_signal(struct pt_regs *regs, int syscall) } no_signal: -if (syscall) { +if (in_syscall (regs)) { +forget_syscall (regs); +/* * Handle restarting a different system call. As above, * if a debugger has chosen to restart at a different PC,
@@ -333,10 +336,10 @@ static void do_signal(struct pt_regs *regs, int syscall) } asmlinkage void -do_notify_resume (unsigned int thread_flags,struct pt_regs *regs,int syscall) +do_notify_resume (unsigned int thread_flags,struct pt_regs *regs) {if (thread_flags & _TIF_SIGPENDING) -do_signal (regs, syscall); +do_signal (regs);if (thread_flags & _TIF_NOTIFY_RESUME) {clear_thread_flag (TIF_NOTIFY_RESUME );
Signature · 1 line
2.7.4
[email protected]
maintainerPATCH 2/3 csky: Reconstruct signal.c and entry.S
From: Guo Ren <[email protected]>
Linux kernel has provided some apis for arch signal's implementation. For example:
restore_saved_sigmask()
set_current_blocked()
restore_altstack()
But in last version of csky signal.c didn't use them and some codes are confusing, so reconstruct signal.c with reference to riscv's code.
Now csky signal.c implementation are very close to riscv and we can get the following benefits:
- Clear code structure
- The signal code of riscv and csky can be reviewed together
- Promoting the unification of arch's signal implementation
Also modified the related code in entry.S
--- arch/csky/abiv1/inc/abi/entry.h | 7 - arch/csky/abiv1/inc/abi/regdef.h | 2 + arch/csky/abiv2/inc/abi/entry.h | 7 - arch/csky/abiv2/inc/abi/regdef.h | 2 + arch/csky/kernel/atomic.S | 26 +-- arch/csky/kernel/entry.S | 152 ++++++++--------- arch/csky/kernel/signal.c | 355 +++++++++++++++------------------------ 7 files changed, 213 insertions(+), 338 deletions(-)
arch/csky/abiv1/inc/abi/entry.h +0 -7
@@ -16,9 +16,6 @@#define LSAVE_A4 40#define LSAVE_A5 44 -#define EPC_INCREASE 2 -#define EPC_KEEP 0 - .macro USPTOKSPmtcr sp, ss1 mfcr sp, ss0
@@ -29,10 +26,6 @@ mfcr sp, ss1 .endm -.macro INCTRAP rx - addi \rx, EPC_INCREASE -.endm - .macro SAVE_ALL epc_inc mtcr r13, ss2 mfcr r13, epsr
arch/csky/abiv1/inc/abi/regdef.h +2 -0
@@ -21,4 +21,6 @@#define SYSTRACE_SAVENUM 2 +#define TRAP0_SIZE 2 +#endif /* __ASM_CSKY_REGDEF_H */
arch/csky/abiv2/inc/abi/entry.h +0 -7
@@ -14,18 +14,11 @@#define LSAVE_A2 32#define LSAVE_A3 36 -#define EPC_INCREASE 4 -#define EPC_KEEP 0 -#define KSPTOUSP #define USPTOKSP #define usp cr<14, 1> -.macro INCTRAP rx - addi \rx, EPC_INCREASE -.endm - .macro SAVE_ALL epc_inc subi sp, 152 stw tls, (sp, 0)
arch/csky/abiv2/inc/abi/regdef.h +2 -0
@@ -21,4 +21,6 @@#define SYSTRACE_SAVENUM 5 +#define TRAP0_SIZE 4 +#endif /* __ASM_CSKY_REGDEF_H */
arch/csky/kernel/atomic.S +4 -22
@@ -12,11 +12,10 @@ * If *ptr != oldval && return 1, * else *ptr = newval return 0. */ -#ifdef CONFIG_CPU_HAS_LDSTEX ENTRY(csky_cmpxchg) USPTOKSP mfcr a3, epc - INCTRAP a3 + addi a3, TRAP0_SIZE subi sp, 8 stw a3, (sp, 0)
@@ -24,6 +23,7 @@ ENTRY(csky_cmpxchg) stw a3, (sp, 4) psrset ee +#ifdef CONFIG_CPU_HAS_LDSTEX 1: ldex a3, (a2) cmpne a0, a3
@@ -33,27 +33,7 @@ ENTRY(csky_cmpxchg) bez a3, 1b 2: sync.is - mvc a0 - ldw a3, (sp, 0) - mtcr a3, epc - ldw a3, (sp, 4) - mtcr a3, epsr - addi sp, 8 - KSPTOUSP - rte -END(csky_cmpxchg) #else -ENTRY(csky_cmpxchg) - USPTOKSP - mfcr a3, epc - INCTRAP a3 - - subi sp, 8 - stw a3, (sp, 0) - mfcr a3, epsr - stw a3, (sp, 4) - - psrset ee 1: ldw a3, (a2) cmpne a0, a3
@@ -61,6 +41,7 @@ ENTRY(csky_cmpxchg) 2: stw a1, (a2) 3: +#endif mvc a0 ldw a3, (sp, 0) mtcr a3, epc
@@ -71,6 +52,7 @@ ENTRY(csky_cmpxchg) rte END(csky_cmpxchg) +#ifndef CONFIG_CPU_HAS_LDSTEX /* * Called from tlbmodified exception */
arch/csky/kernel/entry.S +72 -80
266 lines not on this page · raw message
arch/csky/kernel/signal.c +133 -222
479 lines not on this page · raw message
Signature · 1 line
2.7.4
[email protected]
maintainerPATCH 3/3 riscv/signal: Fixup additional syscall restarting
In reply to [email protected]From: Guo Ren <[email protected]>
The function of do_notify_resume called by entry.S could be entered in loop when SIGPENDING was setted again before sret. So we must add prevent code to make syscall restart (regs->sepc -= 0x4) or it may re-execute unexpected instructions.
Just like in_syscall & forget_syscall used by arm.
--- arch/riscv/kernel/signal.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/riscv/kernel/signal.c +6 -0
@@ -234,6 +234,9 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)/* Are we from a system call? */ if (regs->scause ==EXC_SYSCALL ) { +/* Avoid additional syscall restarting via ret_from_exception */ + regs->scause =-1UL ; +/* If so, check system call restarting.. */ switch (regs->a0) {case -ERESTART_RESTARTBLOCK :
@@ -272,6 +275,9 @@ static void do_signal(struct pt_regs *regs)/* Did we come from a system call? */ if (regs->scause ==EXC_SYSCALL ) { +/* Avoid additional syscall restarting via ret_from_exception */ + regs->scause =-1UL ; +/* Restart the system call - no handlers present */ switch (regs->a0) {case -ERESTARTNOHAND :
Signature · 1 line
2.7.4
Re: [PATCH 3/3] riscv/signal: Fixup additional syscall restarting
Looks good,
Re: [PATCH 3/3] riscv/signal: Fixup additional syscall restarting
Quoted 3 lines · Christoph Hellwig
Looks good,
Reviewed-by Christoph Hellwig <[email protected]>
Thanks! I've pulled just this patch into my for-next, as I'm assuming the c-sky patches will go in seperately. Given that it's been on the list for a while I think it's a good candidate for rc7, so unless anyone says something or testing causes a problem I'll send it up tomorrow.