Skip to content

Commit c5e7ee7

Browse files
compudjguoren83
authored andcommitted
Revert "csky: Fixup CONFIG_DEBUG_RSEQ"
This reverts commit f36e0aa. The csky rseq support has been merged without ever notifying the rseq maintainers, and without any of the required asssembler glue in the rseq selftests, which means it is entirely untested. It is also derived from a non-upstream riscv patch which has known bugs. The assembly part of this revert should be carefully reviewed by the architecture maintainer because it touches code which has changed since the merge of the reverted patch. The rseq selftests assembly glue should be introduced at the same time as the architecture rseq support. Without the presence of any test, I recommend reverting rseq support from csky for now. Link: https://lore.kernel.org/lkml/[email protected]/ Signed-off-by: Mathieu Desnoyers <[email protected]> Signed-off-by: Guo Ren <[email protected]> Cc: Al Viro <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: [email protected]
1 parent ce0ba95 commit c5e7ee7

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

arch/csky/kernel/entry.S

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ ENTRY(csky_systemcall)
5050
SAVE_ALL TRAP0_SIZE
5151
zero_fp
5252
context_tracking
53+
#ifdef CONFIG_RSEQ_DEBUG
54+
mov a0, sp
55+
jbsr rseq_syscall
56+
#endif
5357
psrset ee, ie
5458

5559
lrw r9, __NR_syscalls
5660
cmphs syscallid, r9 /* Check nr of syscall */
57-
bt 1f
61+
bt ret_from_exception
5862

5963
lrw r9, sys_call_table
6064
ixw r9, syscallid
@@ -80,11 +84,6 @@ ENTRY(csky_systemcall)
8084
jsr syscallid
8185
#endif
8286
stw a0, (sp, LSAVE_A0) /* Save return value */
83-
1:
84-
#ifdef CONFIG_DEBUG_RSEQ
85-
mov a0, sp
86-
jbsr rseq_syscall
87-
#endif
8887
jmpi ret_from_exception
8988

9089
csky_syscall_trace:
@@ -113,10 +112,6 @@ csky_syscall_trace:
113112
stw a0, (sp, LSAVE_A0) /* Save return value */
114113

115114
1:
116-
#ifdef CONFIG_DEBUG_RSEQ
117-
mov a0, sp
118-
jbsr rseq_syscall
119-
#endif
120115
mov a0, sp /* right now, sp --> pt_regs */
121116
jbsr syscall_trace_exit
122117
br ret_from_exception

0 commit comments

Comments
 (0)