2019-02-27 18:51:46 +00:00
|
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
Date: Mon, 18 Feb 2019 16:57:09 +0100
|
2019-11-25 00:04:39 +00:00
|
|
|
Subject: [PATCH 242/290] x86: lazy-preempt: properly check against
|
2019-04-08 23:49:20 +00:00
|
|
|
preempt-mask
|
2019-11-25 00:04:39 +00:00
|
|
|
Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=e87427920276b51f5f1d11c24ac3f23473907b66
|
2019-02-27 18:51:46 +00:00
|
|
|
|
|
|
|
|
should_resched() should check against preempt_offset after unmasking the
|
|
|
|
|
need-resched-bit. Otherwise should_resched() won't work for
|
|
|
|
|
preempt_offset != 0 and lazy-preempt set.
|
|
|
|
|
|
|
|
|
|
Cc: stable-rt@vger.kernel.org
|
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
---
|
2019-04-08 23:49:20 +00:00
|
|
|
arch/x86/include/asm/preempt.h | 2 +-
|
2019-02-27 18:51:46 +00:00
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
|
|
|
|
|
index 22992c837795..f66708779274 100644
|
2019-02-27 18:51:46 +00:00
|
|
|
--- a/arch/x86/include/asm/preempt.h
|
|
|
|
|
+++ b/arch/x86/include/asm/preempt.h
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -118,7 +118,7 @@ static __always_inline bool should_resched(int preempt_offset)
|
2019-02-27 18:51:46 +00:00
|
|
|
|
|
|
|
|
/* preempt count == 0 ? */
|
|
|
|
|
tmp &= ~PREEMPT_NEED_RESCHED;
|
|
|
|
|
- if (tmp)
|
|
|
|
|
+ if (tmp != preempt_offset)
|
|
|
|
|
return false;
|
|
|
|
|
if (current_thread_info()->preempt_lazy_count)
|
|
|
|
|
return false;
|
