diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-11-20 05:44:18 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-11-26 12:26:14 -0500 |
| commit | 0f67e90e1caea4a0a14d2c60102547bce29f7f08 (patch) | |
| tree | 06e46b8b4f8f8fe6c08371987252294769d1acc1 | |
| parent | 07500b0d855b7f3f47ca263b21b6397d743d45d2 (diff) | |
[MIPS] Fix possible hang in LL/SC futex loops.
The LL / SC loops in __futex_atomic_op() have the usual fixups necessary
for memory acccesses to userspace from kernel space installed:
__asm__ __volatile__(
" .set push \n"
" .set noat \n"
" .set mips3 \n"
"1: ll %1, %4 # __futex_atomic_op \n"
" .set mips0 \n"
" " insn " \n"
" .set mips3 \n"
"2: sc $1, %2 \n"
" beqz $1, 1b \n"
__WEAK_LLSC_MB
"3: \n"
" .set pop \n"
" .set mips0 \n"
" .section .fixup,\"ax\" \n"
"4: li %0, %6 \n"
" j 2b \n" <-----
" .previous \n"
" .section __ex_table,\"a\" \n"
" "__UA_ADDR "\t1b, 4b \n"
" "__UA_ADDR "\t2b, 4b \n"
" .previous \n"
: "=r" (ret), "=&r" (oldval), "=R" (*uaddr)
: "0" (0), "R" (*uaddr), "Jr" (oparg), "i" (-EFAULT)
: "memory");
The branch at the end of the fixup code, it goes back to the SC
instruction, no matter if the fault was first taken by the LL or SC
instruction resulting in an endless loop which will only terminate if
the address become valid again due to another thread setting up an
accessible mapping and the CPU happens to execute the SC instruction
successfully which due to the preceeding ERET instruction of the fault
handler would only happen if UNPREDICTABLE instruction behaviour of the
SC instruction without a preceeding LL happens to favor that outcome.
But normally processes are nice, pass valid arguments and we were just
getting away with this.
Thanks to Kaz Kylheku <kaz@zeugmasystems.com> for providing the original
report and a test case.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | include/asm-mips/futex.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-mips/futex.h b/include/asm-mips/futex.h index 3e7e30d4f418..17f082cfea85 100644 --- a/include/asm-mips/futex.h +++ b/include/asm-mips/futex.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | " .set mips0 \n" \ | 35 | " .set mips0 \n" \ |
| 36 | " .section .fixup,\"ax\" \n" \ | 36 | " .section .fixup,\"ax\" \n" \ |
| 37 | "4: li %0, %6 \n" \ | 37 | "4: li %0, %6 \n" \ |
| 38 | " j 2b \n" \ | 38 | " j 3b \n" \ |
| 39 | " .previous \n" \ | 39 | " .previous \n" \ |
| 40 | " .section __ex_table,\"a\" \n" \ | 40 | " .section __ex_table,\"a\" \n" \ |
| 41 | " "__UA_ADDR "\t1b, 4b \n" \ | 41 | " "__UA_ADDR "\t1b, 4b \n" \ |
| @@ -61,7 +61,7 @@ | |||
| 61 | " .set mips0 \n" \ | 61 | " .set mips0 \n" \ |
| 62 | " .section .fixup,\"ax\" \n" \ | 62 | " .section .fixup,\"ax\" \n" \ |
| 63 | "4: li %0, %6 \n" \ | 63 | "4: li %0, %6 \n" \ |
| 64 | " j 2b \n" \ | 64 | " j 3b \n" \ |
| 65 | " .previous \n" \ | 65 | " .previous \n" \ |
| 66 | " .section __ex_table,\"a\" \n" \ | 66 | " .section __ex_table,\"a\" \n" \ |
| 67 | " "__UA_ADDR "\t1b, 4b \n" \ | 67 | " "__UA_ADDR "\t1b, 4b \n" \ |
| @@ -200,4 +200,4 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) | |||
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | #endif | 202 | #endif |
| 203 | #endif | 203 | #endif /* _ASM_FUTEX_H */ |