Skip to content

L
linux
Commit 6b5f2590 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'csky-for-linus-5.7-rc8' of git://github.com/c-sky/csky-linux 

Pull csky fixes from Guo Ren:
 "Another four fixes for csky:

   - fix req_syscall debug

   - fix abiv2 syscall_trace

   - fix preempt enable

   - clean up regs usage in entry.S"

* tag 'csky-for-linus-5.7-rc8' of git://github.com/c-sky/csky-linux:
  csky: Fixup CONFIG_DEBUG_RSEQ
  csky: Coding convention in entry.S
  csky: Fixup abiv2 syscall_trace break a4 & a5
  csky: Fixup CONFIG_PREEMPT panic
parents b0c3ba31 f36e0aab
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 71 deletions
arch/csky/abiv1/inc/abi/entry.h
View file @ 6b5f2590
...@@ -80,7 +80,6 @@ ...@@ -80,7 +80,6 @@
.endm .endm
.macro RESTORE_ALL .macro RESTORE_ALL
psrclr ie
ldw lr, (sp, 4) ldw lr, (sp, 4)
ldw a0, (sp, 8) ldw a0, (sp, 8)
mtcr a0, epc mtcr a0, epc
...@@ -175,9 +174,4 @@ ...@@ -175,9 +174,4 @@
movi r6, 0 movi r6, 0
cpwcr r6, cpcr31 cpwcr r6, cpcr31
.endm .endm
.macro ANDI_R3 rx, imm
lsri \rx, 3
andi \rx, (\imm >> 3)
.endm
#endif /* __ASM_CSKY_ENTRY_H */ #endif /* __ASM_CSKY_ENTRY_H */
arch/csky/abiv2/inc/abi/entry.h
View file @ 6b5f2590
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#define LSAVE_A1 28 #define LSAVE_A1 28
#define LSAVE_A2 32 #define LSAVE_A2 32
#define LSAVE_A3 36 #define LSAVE_A3 36
#define LSAVE_A4 40
#define LSAVE_A5 44
#define KSPTOUSP #define KSPTOUSP
#define USPTOKSP #define USPTOKSP
...@@ -63,7 +65,6 @@ ...@@ -63,7 +65,6 @@
.endm .endm
.macro RESTORE_ALL .macro RESTORE_ALL
psrclr ie
ldw tls, (sp, 0) ldw tls, (sp, 0)
ldw lr, (sp, 4) ldw lr, (sp, 4)
ldw a0, (sp, 8) ldw a0, (sp, 8)
...@@ -301,9 +302,4 @@ ...@@ -301,9 +302,4 @@
jmpi 3f /* jump to va */ jmpi 3f /* jump to va */
3: 3:
.endm .endm
.macro ANDI_R3 rx, imm
lsri \rx, 3
andi \rx, (\imm >> 3)
.endm
#endif /* __ASM_CSKY_ENTRY_H */ #endif /* __ASM_CSKY_ENTRY_H */
arch/csky/include/asm/thread_info.h
View file @ 6b5f2590
...@@ -81,4 +81,10 @@ static inline struct thread_info *current_thread_info(void) ...@@ -81,4 +81,10 @@ static inline struct thread_info *current_thread_info(void)
#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
#define _TIF_SECCOMP (1 << TIF_SECCOMP) #define _TIF_SECCOMP (1 << TIF_SECCOMP)
#define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
_TIF_NOTIFY_RESUME | _TIF_UPROBE)
#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
_TIF_SYSCALL_TRACEPOINT)
#endif /* _ASM_CSKY_THREAD_INFO_H */ #endif /* _ASM_CSKY_THREAD_INFO_H */
arch/csky/kernel/entry.S
View file @ 6b5f2590
...@@ -128,39 +128,41 @@ tlbop_end 1 ...@@ -128,39 +128,41 @@ tlbop_end 1
ENTRY(csky_systemcall) ENTRY(csky_systemcall)
SAVE_ALL TRAP0_SIZE SAVE_ALL TRAP0_SIZE
zero_fp zero_fp
#ifdef CONFIG_RSEQ_DEBUG
mov a0, sp
jbsr rseq_syscall
#endif
psrset ee, ie psrset ee, ie
lrw r11, __NR_syscalls lrw r9, __NR_syscalls
cmphs syscallid, r11 /* Check nr of syscall */ cmphs syscallid, r9 /* Check nr of syscall */
bt ret_from_exception bt 1f
lrw r13, sys_call_table lrw r9, sys_call_table
ixw r13, syscallid ixw r9, syscallid
ldw r11, (r13) ldw syscallid, (r9)
cmpnei r11, 0 cmpnei syscallid, 0
bf ret_from_exception bf ret_from_exception
mov r9, sp mov r9, sp
bmaski r10, THREAD_SHIFT bmaski r10, THREAD_SHIFT
andn r9, r10 andn r9, r10
ldw r12, (r9, TINFO_FLAGS) ldw r10, (r9, TINFO_FLAGS)
ANDI_R3 r12, (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_AUDIT) lrw r9, _TIF_SYSCALL_WORK
cmpnei r12, 0 and r10, r9
cmpnei r10, 0
bt csky_syscall_trace bt csky_syscall_trace
#if defined(__CSKYABIV2__) #if defined(__CSKYABIV2__)
subi sp, 8 subi sp, 8
stw r5, (sp, 0x4) stw r5, (sp, 0x4)
stw r4, (sp, 0x0) stw r4, (sp, 0x0)
jsr r11 /* Do system call */ jsr syscallid /* Do system call */
addi sp, 8 addi sp, 8
#else #else
jsr r11 jsr syscallid
#endif #endif
stw a0, (sp, LSAVE_A0) /* Save return value */ stw a0, (sp, LSAVE_A0) /* Save return value */
1:
#ifdef CONFIG_DEBUG_RSEQ
mov a0, sp
jbsr rseq_syscall
#endif
jmpi ret_from_exception jmpi ret_from_exception
csky_syscall_trace: csky_syscall_trace:
...@@ -173,18 +175,23 @@ csky_syscall_trace: ...@@ -173,18 +175,23 @@ csky_syscall_trace:
ldw a3, (sp, LSAVE_A3) ldw a3, (sp, LSAVE_A3)
#if defined(__CSKYABIV2__) #if defined(__CSKYABIV2__)
subi sp, 8 subi sp, 8
stw r5, (sp, 0x4) ldw r9, (sp, LSAVE_A4)
stw r4, (sp, 0x0) stw r9, (sp, 0x0)
ldw r9, (sp, LSAVE_A5)
stw r9, (sp, 0x4)
jsr syscallid /* Do system call */
addi sp, 8
#else #else
ldw r6, (sp, LSAVE_A4) ldw r6, (sp, LSAVE_A4)
ldw r7, (sp, LSAVE_A5) ldw r7, (sp, LSAVE_A5)
#endif jsr syscallid /* Do system call */
jsr r11 /* Do system call */
#if defined(__CSKYABIV2__)
addi sp, 8
#endif #endif
stw a0, (sp, LSAVE_A0) /* Save return value */ stw a0, (sp, LSAVE_A0) /* Save return value */
#ifdef CONFIG_DEBUG_RSEQ
mov a0, sp
jbsr rseq_syscall
#endif
mov a0, sp /* right now, sp --> pt_regs */ mov a0, sp /* right now, sp --> pt_regs */
jbsr syscall_trace_exit jbsr syscall_trace_exit
br ret_from_exception br ret_from_exception
...@@ -200,18 +207,20 @@ ENTRY(ret_from_fork) ...@@ -200,18 +207,20 @@ ENTRY(ret_from_fork)
mov r9, sp mov r9, sp
bmaski r10, THREAD_SHIFT bmaski r10, THREAD_SHIFT
andn r9, r10 andn r9, r10
ldw r12, (r9, TINFO_FLAGS) ldw r10, (r9, TINFO_FLAGS)
ANDI_R3 r12, (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_AUDIT) lrw r9, _TIF_SYSCALL_WORK
cmpnei r12, 0 and r10, r9
cmpnei r10, 0
bf ret_from_exception bf ret_from_exception
mov a0, sp /* sp = pt_regs pointer */ mov a0, sp /* sp = pt_regs pointer */
jbsr syscall_trace_exit jbsr syscall_trace_exit
ret_from_exception: ret_from_exception:
ld syscallid, (sp, LSAVE_PSR) psrclr ie
btsti syscallid, 31 ld r9, (sp, LSAVE_PSR)
bt 1f btsti r9, 31
bt 1f
/* /*
* Load address of current->thread_info, Then get address of task_struct * Load address of current->thread_info, Then get address of task_struct
* Get task_needreshed in task_struct * Get task_needreshed in task_struct
...@@ -220,11 +229,24 @@ ret_from_exception: ...@@ -220,11 +229,24 @@ ret_from_exception:
bmaski r10, THREAD_SHIFT bmaski r10, THREAD_SHIFT
andn r9, r10 andn r9, r10
ldw r12, (r9, TINFO_FLAGS) ldw r10, (r9, TINFO_FLAGS)
andi r12, (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | _TIF_UPROBE) lrw r9, _TIF_WORK_MASK
cmpnei r12, 0 and r10, r9
cmpnei r10, 0
bt exit_work bt exit_work
1: 1:
#ifdef CONFIG_PREEMPTION
mov r9, sp
bmaski r10, THREAD_SHIFT
andn r9, r10
ldw r10, (r9, TINFO_PREEMPT)
cmpnei r10, 0
bt 2f
jbsr preempt_schedule_irq /* irq en/disable is done inside */
2:
#endif
#ifdef CONFIG_TRACE_IRQFLAGS #ifdef CONFIG_TRACE_IRQFLAGS
ld r10, (sp, LSAVE_PSR) ld r10, (sp, LSAVE_PSR)
btsti r10, 6 btsti r10, 6
...@@ -235,14 +257,15 @@ ret_from_exception: ...@@ -235,14 +257,15 @@ ret_from_exception:
RESTORE_ALL RESTORE_ALL
exit_work: exit_work:
lrw syscallid, ret_from_exception lrw r9, ret_from_exception
mov lr, syscallid mov lr, r9
btsti r12, TIF_NEED_RESCHED btsti r10, TIF_NEED_RESCHED
bt work_resched bt work_resched
psrset ie
mov a0, sp mov a0, sp
mov a1, r12 mov a1, r10
jmpi do_notify_resume jmpi do_notify_resume
work_resched: work_resched:
...@@ -291,34 +314,10 @@ ENTRY(csky_irq) ...@@ -291,34 +314,10 @@ ENTRY(csky_irq)
jbsr trace_hardirqs_off jbsr trace_hardirqs_off
#endif #endif
#ifdef CONFIG_PREEMPTION
mov r9, sp /* Get current stack pointer */
bmaski r10, THREAD_SHIFT
andn r9, r10 /* Get thread_info */
/*
* Get task_struct->stack.preempt_count for current,
* and increase 1.
*/
ldw r12, (r9, TINFO_PREEMPT)
addi r12, 1
stw r12, (r9, TINFO_PREEMPT)
#endif
mov a0, sp mov a0, sp
jbsr csky_do_IRQ jbsr csky_do_IRQ
#ifdef CONFIG_PREEMPTION
subi r12, 1
stw r12, (r9, TINFO_PREEMPT)
cmpnei r12, 0
bt 2f
ldw r12, (r9, TINFO_FLAGS)
btsti r12, TIF_NEED_RESCHED
bf 2f
jbsr preempt_schedule_irq /* irq en/disable is done inside */
#endif
2:
jmpi ret_from_exception jmpi ret_from_exception
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7