summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAnkur Arora <ankur.a.arora@oracle.com>2024-12-13 07:06:55 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-04 15:42:13 +0300
commit9abec90c85b22983c88510e77844b507cbd80db5 (patch)
treee3cbbe0b13e706983789a72e0be007d28653430d /include/linux
parent4a36d93a01758589267a51cd871962a638964888 (diff)
downloadlinux-9abec90c85b22983c88510e77844b507cbd80db5.tar.xz
rcu: handle unstable rdp in rcu_read_unlock_strict()
[ Upstream commit fcf0e25ad4c8d14d2faab4d9a17040f31efce205 ] rcu_read_unlock_strict() can be called with preemption enabled which can make for an unstable rdp and a racy norm value. Fix this by dropping the preempt-count in __rcu_read_unlock() after the call to rcu_read_unlock_strict(), adjusting the preempt-count check appropriately. Suggested-by: Frederic Weisbecker <frederic@kernel.org> Signed-off-by: Ankur Arora <ankur.a.arora@oracle.com> Reviewed-by: Frederic Weisbecker <frederic@kernel.org> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> Signed-off-by: Boqun Feng <boqun.feng@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/rcupdate.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 72da69cc5764..27531a0b3a6e 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -97,9 +97,9 @@ static inline void __rcu_read_lock(void)
static inline void __rcu_read_unlock(void)
{
- preempt_enable();
if (IS_ENABLED(CONFIG_RCU_STRICT_GRACE_PERIOD))
rcu_read_unlock_strict();
+ preempt_enable();
}
static inline int rcu_preempt_depth(void)