From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>, Daniel Wagner <wagi@monom.org>,
Tom Zanussi <zanussi@kernel.org>,
"Srivatsa S. Bhat" <srivatsa@csail.mit.edu>,
stable-rt@vger.kernel.org
Subject: [PATCH RT 4/9] preempt: Move preempt_enable_no_resched() to the RT block
Date: Mon, 15 Nov 2021 18:33:43 -0500 [thread overview]
Message-ID: <20211115233402.465081217@goodmis.org> (raw)
In-Reply-To: 20211115233339.509057092@goodmis.org
5.10.78-rt56-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
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>
---
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 af39859f02ee..7b5b2ed55531 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -208,12 +208,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.33.0
next prev parent reply other threads:[~2021-11-15 23:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 23:33 [PATCH RT 0/9] Linux 5.10.78-rt56-rc1 Steven Rostedt
2021-11-15 23:33 ` [PATCH RT 1/9] mm, zsmalloc: Convert zsmalloc_handle.lock to spinlock_t Steven Rostedt
2021-11-15 23:33 ` [PATCH RT 2/9] sched: Fix get_push_task() vs migrate_disable() Steven Rostedt
2021-11-15 23:33 ` [PATCH RT 3/9] sched: Switch wait_task_inactive to HRTIMER_MODE_REL_HARD Steven Rostedt
2021-11-15 23:33 ` Steven Rostedt [this message]
2021-11-15 23:33 ` [PATCH RT 5/9] mm: Disable NUMA_BALANCING_DEFAULT_ENABLED and TRANSPARENT_HUGEPAGE on PREEMPT_RT Steven Rostedt
2021-11-15 23:33 ` [PATCH RT 6/9] fscache: Use only one fscache_object_cong_wait Steven Rostedt
2021-11-15 23:33 ` [PATCH RT 7/9] fscache: Use only one fscache_object_cong_wait. [update] Steven Rostedt
2021-11-15 23:33 ` [PATCH RT 8/9] locking: Drop might_resched() from might_sleep_no_state_check() Steven Rostedt
2021-11-15 23:33 ` [PATCH RT 9/9] Linux 5.10.78-rt56-rc1 Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211115233402.465081217@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=bigeasy@linutronix.de \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=srivatsa@csail.mit.edu \
--cc=stable-rt@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=wagi@monom.org \
--cc=zanussi@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.