Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Andrea Parri <andrea.parri@amarulasolutions.com>
To:     David Howells <dhowells@redhat.com>
Cc:     linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org,
        Andrea Parri <andrea.parri@amarulasolutions.com>
Subject: [PATCH] afs: Add missing memory barriers in afs_manage_cell()
Date:   Mon, 26 Nov 2018 17:44:12 +0100
Message-Id: <20181126164412.11184-1-andrea.parri@amarulasolutions.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

As the comments for wake_up_bit() and waitqueue_active() point out,
the barriers are needed to order the clearing of the _FL_NOT_READY
bit and the waitqueue_active() load; match the implicit barrier in
prepare_to_wait().

Signed-off-by: Andrea Parri <andrea.parri@amarulasolutions.com>
---
 fs/afs/cell.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/afs/cell.c b/fs/afs/cell.c
index cf445dbd5f2e0..a9488abe56029 100644
--- a/fs/afs/cell.c
+++ b/fs/afs/cell.c
@@ -637,6 +637,7 @@ static void afs_manage_cell(struct work_struct *work)
 		cell->state = AFS_CELL_ACTIVE;
 		smp_wmb();
 		clear_bit(AFS_CELL_FL_NOT_READY, &cell->flags);
+		smp_mb__after_atomic(); /* see comment for wake_up_bit() */
 		wake_up_bit(&cell->flags, AFS_CELL_FL_NOT_READY);
 		goto again;
 
@@ -678,6 +679,7 @@ static void afs_manage_cell(struct work_struct *work)
 	cell->state = AFS_CELL_ACTIVE;
 	smp_wmb();
 	clear_bit(AFS_CELL_FL_NOT_READY, &cell->flags);
+	smp_mb__after_atomic(); /* see comment for wake_up_bit() */
 	wake_up_bit(&cell->flags, AFS_CELL_FL_NOT_READY);
 	_leave(" [deact->act]");
 	return;
-- 
2.17.1