Skip to content

Commit 2116d70

Browse files
committed
Merge branch 'lkmm' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into locking/core
Pull LKMM changes for v5.10 from Paul E. McKenney. Various documentation updates. Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents d6c4c11 + 0ce0c78 commit 2116d70

6 files changed

Lines changed: 1410 additions & 134 deletions

File tree

tools/memory-model/Documentation/cheatsheet.txt

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
C Self R W RMW Self R W DR DW RMW SV
44
-- ---- - - --- ---- - - -- -- --- --
55

6-
Store, e.g., WRITE_ONCE() Y Y
7-
Load, e.g., READ_ONCE() Y Y Y Y
8-
Unsuccessful RMW operation Y Y Y Y
6+
Relaxed store Y Y
7+
Relaxed load Y Y Y Y
8+
Relaxed RMW operation Y Y Y Y
99
rcu_dereference() Y Y Y Y
1010
Successful *_acquire() R Y Y Y Y Y Y
1111
Successful *_release() C Y Y Y W Y
@@ -17,14 +17,19 @@ smp_mb__before_atomic() CP Y Y Y a a a a Y
1717
smp_mb__after_atomic() CP a a Y Y Y Y Y Y
1818

1919

20-
Key: C: Ordering is cumulative
21-
P: Ordering propagates
22-
R: Read, for example, READ_ONCE(), or read portion of RMW
23-
W: Write, for example, WRITE_ONCE(), or write portion of RMW
24-
Y: Provides ordering
25-
a: Provides ordering given intervening RMW atomic operation
26-
DR: Dependent read (address dependency)
27-
DW: Dependent write (address, data, or control dependency)
28-
RMW: Atomic read-modify-write operation
29-
SELF: Orders self, as opposed to accesses before and/or after
30-
SV: Orders later accesses to the same variable
20+
Key: Relaxed: A relaxed operation is either READ_ONCE(), WRITE_ONCE(),
21+
a *_relaxed() RMW operation, an unsuccessful RMW
22+
operation, a non-value-returning RMW operation such
23+
as atomic_inc(), or one of the atomic*_read() and
24+
atomic*_set() family of operations.
25+
C: Ordering is cumulative
26+
P: Ordering propagates
27+
R: Read, for example, READ_ONCE(), or read portion of RMW
28+
W: Write, for example, WRITE_ONCE(), or write portion of RMW
29+
Y: Provides ordering
30+
a: Provides ordering given intervening RMW atomic operation
31+
DR: Dependent read (address dependency)
32+
DW: Dependent write (address, data, or control dependency)
33+
RMW: Atomic read-modify-write operation
34+
SELF: Orders self, as opposed to accesses before and/or after
35+
SV: Orders later accesses to the same variable

0 commit comments

Comments
 (0)