78 lines
3.0 KiB
Diff
78 lines
3.0 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Fri, 22 Jan 2016 21:33:39 +0100
|
|
Subject: arm+arm64: lazy-preempt: add TIF_NEED_RESCHED_LAZY to _TIF_WORK_MASK
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patches-4.4.1-rt5.tar.xz
|
|
|
|
_TIF_WORK_MASK is used to check for TIF_NEED_RESCHED so we need to check
|
|
for TIF_NEED_RESCHED_LAZY here, too.
|
|
|
|
Reported-by: Grygorii Strashko <grygorii.strashko@ti.com>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
arch/arm/include/asm/thread_info.h | 7 ++++---
|
|
arch/arm/kernel/entry-common.S | 9 +++++++--
|
|
arch/arm64/include/asm/thread_info.h | 3 ++-
|
|
3 files changed, 13 insertions(+), 6 deletions(-)
|
|
|
|
--- a/arch/arm/include/asm/thread_info.h
|
|
+++ b/arch/arm/include/asm/thread_info.h
|
|
@@ -143,8 +143,8 @@ extern int vfp_restore_user_hwstate(stru
|
|
#define TIF_SYSCALL_TRACE 4 /* syscall trace active */
|
|
#define TIF_SYSCALL_AUDIT 5 /* syscall auditing active */
|
|
#define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint instrumentation */
|
|
-#define TIF_SECCOMP 7 /* seccomp syscall filtering active */
|
|
-#define TIF_NEED_RESCHED_LAZY 8
|
|
+#define TIF_SECCOMP 8 /* seccomp syscall filtering active */
|
|
+#define TIF_NEED_RESCHED_LAZY 7
|
|
|
|
#define TIF_NOHZ 12 /* in adaptive nohz mode */
|
|
#define TIF_USING_IWMMXT 17
|
|
@@ -170,7 +170,8 @@ extern int vfp_restore_user_hwstate(stru
|
|
* Change these and you break ASM code in entry-common.S
|
|
*/
|
|
#define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
|
|
- _TIF_NOTIFY_RESUME | _TIF_UPROBE)
|
|
+ _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
|
|
+ _TIF_NEED_RESCHED_LAZY)
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* __ASM_ARM_THREAD_INFO_H */
|
|
--- a/arch/arm/kernel/entry-common.S
|
|
+++ b/arch/arm/kernel/entry-common.S
|
|
@@ -36,7 +36,9 @@
|
|
UNWIND(.cantunwind )
|
|
disable_irq_notrace @ disable interrupts
|
|
ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
|
|
- tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
|
|
+ tst r1, #((_TIF_SYSCALL_WORK | _TIF_WORK_MASK) & ~_TIF_SECCOMP)
|
|
+ bne fast_work_pending
|
|
+ tst r1, #_TIF_SECCOMP
|
|
bne fast_work_pending
|
|
|
|
/* perform architecture specific actions before user return */
|
|
@@ -62,8 +64,11 @@ ENDPROC(ret_fast_syscall)
|
|
str r0, [sp, #S_R0 + S_OFF]! @ save returned r0
|
|
disable_irq_notrace @ disable interrupts
|
|
ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
|
|
- tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
|
|
+ tst r1, #((_TIF_SYSCALL_WORK | _TIF_WORK_MASK) & ~_TIF_SECCOMP)
|
|
+ bne do_slower_path
|
|
+ tst r1, #_TIF_SECCOMP
|
|
beq no_work_pending
|
|
+do_slower_path:
|
|
UNWIND(.fnend )
|
|
ENDPROC(ret_fast_syscall)
|
|
|
|
--- a/arch/arm64/include/asm/thread_info.h
|
|
+++ b/arch/arm64/include/asm/thread_info.h
|
|
@@ -129,7 +129,8 @@ static inline struct thread_info *curren
|
|
#define _TIF_32BIT (1 << TIF_32BIT)
|
|
|
|
#define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
|
|
- _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE)
|
|
+ _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \
|
|
+ _TIF_NEED_RESCHED_LAZY)
|
|
|
|
#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
|
|
_TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
|