[tip:,core/rcu] rcu: Add explicit barrier() to __rcu_read_unlock()
diff mbox series

Message ID 161814860762.29796.4207906617795000377.tip-bot2@tip-bot2
State Accepted
Commit 7e937220afa3eada0d4611b31e4e3c60770e39b4
Headers show
Series
  • [tip:,core/rcu] rcu: Add explicit barrier() to __rcu_read_unlock()
Related show

Commit Message

tip-bot2 for Vitaly Kuznetsov April 11, 2021, 1:43 p.m. UTC
The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     7e937220afa3eada0d4611b31e4e3c60770e39b4
Gitweb:        https://git.kernel.org/tip/7e937220afa3eada0d4611b31e4e3c60770e39b4
Author:        Paul E. McKenney <paulmck@kernel.org>
AuthorDate:    Fri, 26 Feb 2021 11:25:29 -08:00
Committer:     Paul E. McKenney <paulmck@kernel.org>
CommitterDate: Mon, 15 Mar 2021 13:53:24 -07:00

rcu: Add explicit barrier() to __rcu_read_unlock()

Because preemptible RCU's __rcu_read_unlock() is an external function,
the rough equivalent of an implicit barrier() is inserted by the compiler.
Except that there is a direct call to __rcu_read_unlock() in that same
file, and compilers are getting to the point where they might choose to
inline the fastpath of the __rcu_read_unlock() function.

This commit therefore adds an explicit barrier() to the very beginning
of __rcu_read_unlock().

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
 kernel/rcu/tree_plugin.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch
diff mbox series

diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index 2d60377..a32494c 100644
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -393,8 +393,9 @@  void __rcu_read_unlock(void)
 {
 	struct task_struct *t = current;
 
+	barrier();  // critical section before exit code.
 	if (rcu_preempt_read_exit() == 0) {
-		barrier();  /* critical section before exit code. */
+		barrier();  // critical-section exit before .s check.
 		if (unlikely(READ_ONCE(t->rcu_read_unlock_special.s)))
 			rcu_read_unlock_special(t);
 	}