aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2019-06-20 11:55:36 -0400
committerPaul E. McKenney <paulmck@linux.ibm.com>2019-06-21 16:18:45 -0700
commitf9de417121001879d92a86960647adb06b5b81bf (patch)
treee194fde88ab826f0f05995c3d94a52c9c41664c4 /tools
parent37c600a3cc8a6941d77e853ec4e0e33fffa1046b (diff)
downloadtip-f9de417121001879d92a86960647adb06b5b81bf.tar.gz
tip-f9de417121001879d92a86960647adb06b5b81bf.tar.xz
tip-f9de417121001879d92a86960647adb06b5b81bf.zip
tools/memory-model: Expand definition of barrier
Commit 66be4e66a7f4 ("rcu: locking and unlocking need to always be at least barriers") added compiler barriers back into rcu_read_lock() and rcu_read_unlock(). Furthermore, srcu_read_lock() and srcu_read_unlock() have always contained compiler barriers. The Linux Kernel Memory Model ought to know about these barriers. This patch adds them into the memory model. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: Andrea Parri <andrea.parri@amarulasolutions.com> Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/memory-model/linux-kernel.cat3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/memory-model/linux-kernel.cat b/tools/memory-model/linux-kernel.cat
index 36d367054811..8b61218c99fd 100644
--- a/tools/memory-model/linux-kernel.cat
+++ b/tools/memory-model/linux-kernel.cat
@@ -45,7 +45,8 @@ let strong-fence = mb | gp
let nonrw-fence = strong-fence | po-rel | acq-po
let fence = nonrw-fence | wmb | rmb
let barrier = fencerel(Barrier | Rmb | Wmb | Mb | Sync-rcu | Sync-srcu |
- Before-atomic | After-atomic | Acquire | Release) |
+ Before-atomic | After-atomic | Acquire | Release |
+ Rcu-lock | Rcu-unlock | Srcu-lock | Srcu-unlock) |
(po ; [Release]) | ([Acquire] ; po)
(**********************************)