[PATCH 2/6] locking/rwsem: Document barrier need when waking tasks

Davidlohr Bueso
2015-01-26T07:38:07Z

The need for the smp_mb in __rwsem_do_wake should be
properly documented. Applies to both xadd and spinlock
variants.

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
---
kernel/locking/rwsem-spinlock.c | 5 +++++
kernel/locking/rwsem-xadd.c | 5 +++++
2 files changed, 10 insertions(+)

diff --git a/kernel/locking/rwsem-spinlock.c b/kernel/locking/rwsem-spinlock.c
index 2555ae1..54f7a17 100644
--- a/kernel/locking/rwsem-spinlock.c
+++ b/kernel/locking/rwsem-spinlock.c
@@ -85,6 +85,11 @@ __rwsem_do_wake(struct rw_semaphore *sem, int wakewrite)

list_del(&waiter->list);
tsk = waiter->task;
+ /*
+ * Ensure that all cores see the read before
+ * setting it to the waiter task to nil, as that
+ * grants the read lock to the next task.
+ */
smp_mb();
waiter->task = NULL;
wake_up_process(tsk);
diff --git a/kernel/locking/rwsem-xadd.c b/kernel/locking/rwsem-xadd.c
index 2f7cc40..149e8c7 100644
--- a/kernel/locking/rwsem-xadd.c
+++ b/kernel/locking/rwsem-xadd.c
@@ -186,6 +186,11 @@ __rwsem_do_wake(struct rw_semaphore *sem, enum rwsem_wake_type wake_type)
waiter = list_entry(next, struct rwsem_waiter, list);
next = waiter->list.next;
tsk = waiter->task;
+ /*
+ * Ensure that all cores see the read before
+ * setting it to the waiter task to nil, as that
+ * grants the read lock to the next task.
+ */
smp_mb();
waiter->task = NULL;
wake_up_process(tsk);
--
2.1.2