Skip to content

Commit 93a82f8

Browse files
mpredfearngregkh
authored andcommitted
MIPS: Only change $28 to thread_info if coming from user mode
commit 510d86362a27577f5ee23f46cfb354ad49731e61 upstream. The SAVE_SOME macro is used to save the execution context on all exceptions. If an exception occurs while executing user code, the stack is switched to the kernel's stack for the current task, and register $28 is switched to point to the current_thread_info, which is at the bottom of the stack region. If the exception occurs while executing kernel code, the stack is left, and this change ensures that register $28 is not updated. This is the correct behaviour when the kernel can be executing on the separate irq stack, because the thread_info will not be at the base of it. With this change, register $28 is only switched to it's kernel conventional usage of the currrent thread info pointer at the point at which execution enters kernel space. Doing it on every exception was redundant, but OK without an IRQ stack, but will be erroneous once that is introduced. Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com> Acked-by: Jason A. Donenfeld <jason@zx2c4.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: James Hogan <james.hogan@imgtec.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/14742/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Amit Pundir <amit.pundir@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3363653 commit 93a82f8

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

arch/mips/include/asm/stackframe.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,19 @@
216216
LONG_S $25, PT_R25(sp)
217217
LONG_S $28, PT_R28(sp)
218218
LONG_S $31, PT_R31(sp)
219+
220+
/* Set thread_info if we're coming from user mode */
221+
mfc0 k0, CP0_STATUS
222+
sll k0, 3 /* extract cu0 bit */
223+
bltz k0, 9f
224+
219225
ori $28, sp, _THREAD_MASK
220226
xori $28, _THREAD_MASK
221227
#ifdef CONFIG_CPU_CAVIUM_OCTEON
222228
.set mips64
223229
pref 0, 0($28) /* Prefetch the current pointer */
224230
#endif
231+
9:
225232
.set pop
226233
.endm
227234

0 commit comments

Comments
 (0)