powerpc: qspinlock: Enforce qnode writes prior to publishing to queue
authorRohan McLure <rmclure@linux.ibm.com>
Wed, 10 May 2023 03:31:08 +0000 (13:31 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 21 Jun 2023 05:13:57 +0000 (15:13 +1000)
Annotate the release barrier and memory clobber (in effect, producing a
compiler barrier) in the publish_tail_cpu call. These barriers have the
effect of ensuring that qnode attributes are all written to prior to
publish the node to the waitqueue.

Even while the initial write to the 'locked' attribute is guaranteed to
terminate prior to the node being visible, KCSAN still complains that
the write is reorderable by the compiler. Issue a kcsan_release() to
inform KCSAN of the release barrier contained in publish_tail_cpu().

Signed-off-by: Rohan McLure <rmclure@linux.ibm.com>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230510033117.1395895-3-rmclure@linux.ibm.com
arch/powerpc/lib/qspinlock.c

index b76c1f6acce5ce3cacc042ed1f13bf015581f6a0..253620979d0cd849a53d5853d2e995fa4fb6fc69 100644 (file)
@@ -161,6 +161,8 @@ static __always_inline u32 publish_tail_cpu(struct qspinlock *lock, u32 tail)
 {
        u32 prev, tmp;
 
+       kcsan_release();
+
        asm volatile(
 "\t"   PPC_RELEASE_BARRIER "                                           \n"
 "1:    lwarx   %0,0,%2         # publish_tail_cpu                      \n"
@@ -570,6 +572,11 @@ static __always_inline void queued_spin_lock_mcs_queue(struct qspinlock *lock, b
 
        tail = encode_tail_cpu(node->cpu);
 
+       /*
+        * Assign all attributes of a node before it can be published.
+        * Issues an lwsync, serving as a release barrier, as well as a
+        * compiler barrier.
+        */
        old = publish_tail_cpu(lock, tail);
 
        /*