From 99143f82a255e7f054bead8443462fae76dd829e Mon Sep 17 00:00:00 2001

From: Peter Zijlstra <peterz@infradead.org>

Date: Thu, 18 Jul 2019 14:56:17 +0200

Subject: [PATCH] lcoking/rwsem: Add missing ACQUIRE to read_slowpath sleep

 loop

Git-commit: 99143f82a255e7f054bead8443462fae76dd829e

Patch-mainline: v5.3-rc1

References: bsc#1050549

While reviewing another read_slowpath patch, both Will and I noticed

another missing ACQUIRE, namely:

  X = 0;

  CPU0			CPU1

  rwsem_down_read()

    for (;;) {

      set_current_state(TASK_UNINTERRUPTIBLE);

			X = 1;

			rwsem_up_write();

			  rwsem_mark_wake()

			    atomic_long_add(adjustment, &sem->count);

			    smp_store_release(&waiter->task, NULL);

      if (!waiter.task)

	break;

      ...

    }

  r = X;

Allows 'r == 0'.

Reported-by: Peter Zijlstra (Intel) <peterz@infradead.org>

Reported-by: Will Deacon <will@kernel.org>

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>

Acked-by: Will Deacon <will@kernel.org>

Cc: Linus Torvalds <torvalds@linux-foundation.org>

Cc: Peter Zijlstra <peterz@infradead.org>

Cc: Thomas Gleixner <tglx@linutronix.de>

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>

---

 kernel/locking/rwsem-xadd.c | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/locking/rwsem-xadd.c b/kernel/locking/rwsem-xadd.c

index 7d29e15d8f44..cca18df9925d 100644

--- a/kernel/locking/rwsem-xadd.c

+++ b/kernel/locking/rwsem-xadd.c

@@ -277,8 +277,10 @@ __rwsem_down_read_failed_common(struct rw_semaphore *sem, int state)

 	/* wait to be given the lock */

 	while (true) {

 		set_current_state(state);

-		if (!waiter.task)

+		if (!smp_load_acquire(&waiter.task)) {

+			/* Orders against rwsem_mark_wake()'s smp_store_release() */

 			break;

+		}

 		if (signal_pending_state(state, current)) {

 			raw_spin_lock_irq(&sem->wait_lock);

 			if (waiter.task)

--

2.16.4