Messages in this thread Patch in this message | | | From | zanussi@kernel ... | Subject | [PATCH RT 3/8] preempt: Move preempt_enable_no_resched() to the RT block | Date | Wed, 1 Dec 2021 14:41:03 -0600 |
| |
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
v5.4.161-rt67-rc1 stable review patch. If anyone has any objections, please let me know.
-----------
[ Upstream commit 1a45b3551ef852193c3d338888132c4925d0690d ]
preempt_enable_no_resched() should point to preempt_enable() on PREEMPT_RT so nobody is playing any preempt tricks and enables preemption without checking for the need-resched flag.
This was misplaced in v3.14.0-rt1 und remained unnoticed until now.
Point preempt_enable_no_resched() and preempt_enable() on RT.
Cc: stable-rt@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Tom Zanussi <zanussi@kernel.org> --- include/linux/preempt.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index adb085fe31e4..bbc3592b6f04 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -211,12 +211,12 @@ do { \ preempt_count_dec(); \ } while (0) -#ifdef CONFIG_PREEMPT_RT +#ifndef CONFIG_PREEMPT_RT # define preempt_enable_no_resched() sched_preempt_enable_no_resched() -# define preempt_check_resched_rt() preempt_check_resched() +# define preempt_check_resched_rt() barrier(); #else # define preempt_enable_no_resched() preempt_enable() -# define preempt_check_resched_rt() barrier(); +# define preempt_check_resched_rt() preempt_check_resched() #endif #define preemptible() (preempt_count() == 0 && !irqs_disabled()) -- 2.17.1
| |