From: Waiman Long <longman@redhat.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, Will Deacon <will.deacon@arm.com>,
Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
Davidlohr Bueso <dave@stgolabs.net>,
Linus Torvalds <torvalds@linux-foundation.org>,
Tim Chen <tim.c.chen@linux.intel.com>,
huang ying <huang.ying.caritas@gmail.com>,
Waiman Long <longman@redhat.com>
Subject: [PATCH v4 13/16] locking/rwsem: Add more rwsem owner access helpers
Date: Sat, 13 Apr 2019 13:22:56 -0400 [thread overview]
Message-ID: <20190413172259.2740-14-longman@redhat.com> (raw)
In-Reply-To: <20190413172259.2740-1-longman@redhat.com>
Before combining owner and count, we are adding two new helpers for
accessing the owner value in the rwsem.
1) struct task_struct *rwsem_get_owner(struct rw_semaphore *sem)
2) bool is_rwsem_reader_owned(struct rw_semaphore *sem)
Signed-off-by: Waiman Long <longman@redhat.com>
---
kernel/locking/rwsem.c | 50 +++++++++++++++++++++++++++++++-----------
1 file changed, 37 insertions(+), 13 deletions(-)
diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
index 8b23009e6b2c..ab26aba65371 100644
--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -130,6 +130,11 @@ static inline void rwsem_clear_owner(struct rw_semaphore *sem)
WRITE_ONCE(sem->owner, NULL);
}
+static inline struct task_struct *rwsem_get_owner(struct rw_semaphore *sem)
+{
+ return READ_ONCE(sem->owner);
+}
+
/*
* The task_struct pointer of the last owning reader will be left in
* the owner field.
@@ -174,6 +179,23 @@ static inline bool is_rwsem_spinnable(struct rw_semaphore *sem)
return is_rwsem_owner_spinnable(READ_ONCE(sem->owner));
}
+/*
+ * Return true if the rwsem is owned by a reader.
+ */
+static inline bool is_rwsem_reader_owned(struct rw_semaphore *sem)
+{
+#ifdef CONFIG_DEBUG_RWSEMS
+ /*
+ * Check the count to see if it is write-locked.
+ */
+ long count = atomic_long_read(&sem->count);
+
+ if (count & RWSEM_WRITER_MASK)
+ return false;
+#endif
+ return (unsigned long)sem->owner & RWSEM_READER_OWNED;
+}
+
/*
* Return true if rwsem is owned by an anonymous writer or readers.
*/
@@ -193,6 +215,7 @@ static inline void rwsem_clear_reader_owned(struct rw_semaphore *sem)
{
unsigned long val = (unsigned long)current | RWSEM_READER_OWNED
| RWSEM_ANONYMOUSLY_OWNED;
+
if (READ_ONCE(sem->owner) == (struct task_struct *)val)
cmpxchg_relaxed((unsigned long *)&sem->owner, val,
RWSEM_READER_OWNED | RWSEM_ANONYMOUSLY_OWNED);
@@ -530,7 +553,7 @@ static inline bool rwsem_can_spin_on_owner(struct rw_semaphore *sem)
preempt_disable();
rcu_read_lock();
- owner = READ_ONCE(sem->owner);
+ owner = rwsem_get_owner(sem);
if (owner) {
ret = is_rwsem_owner_spinnable(owner) &&
(is_rwsem_owner_reader(owner) || owner_on_cpu(owner));
@@ -562,15 +585,21 @@ enum owner_state {
static noinline enum owner_state rwsem_spin_on_owner(struct rw_semaphore *sem)
{
- struct task_struct *owner = READ_ONCE(sem->owner);
+ struct task_struct *owner = rwsem_get_owner(sem);
long count;
if (!is_rwsem_owner_spinnable(owner))
return OWNER_NONSPINNABLE;
rcu_read_lock();
- while (owner && !is_rwsem_owner_reader(owner)
- && (READ_ONCE(sem->owner) == owner)) {
+ while (owner && !is_rwsem_owner_reader(owner)) {
+ struct task_struct *new_owner = rwsem_get_owner(sem);
+
+ if (new_owner != owner) {
+ owner = new_owner;
+ break; /* The owner has changed */
+ }
+
/*
* Ensure we emit the owner->on_cpu, dereference _after_
* checking sem->owner still matches owner, if that fails,
@@ -597,7 +626,6 @@ static noinline enum owner_state rwsem_spin_on_owner(struct rw_semaphore *sem)
* spinning except when here is no active locks and the handoff bit
* is set. In this case, we have to stop spinning.
*/
- owner = READ_ONCE(sem->owner);
if (!is_rwsem_owner_spinnable(owner))
return OWNER_NONSPINNABLE;
if (owner && !is_rwsem_owner_reader(owner))
@@ -1093,8 +1121,7 @@ inline void __down_read(struct rw_semaphore *sem)
if (unlikely(atomic_long_fetch_add_acquire(RWSEM_READER_BIAS,
&sem->count) & RWSEM_READ_FAILED_MASK)) {
rwsem_down_read_failed(sem);
- DEBUG_RWSEMS_WARN_ON(!((unsigned long)sem->owner &
- RWSEM_READER_OWNED), sem);
+ DEBUG_RWSEMS_WARN_ON(!is_rwsem_reader_owned(sem), sem);
} else {
rwsem_set_reader_owned(sem);
}
@@ -1106,8 +1133,7 @@ static inline int __down_read_killable(struct rw_semaphore *sem)
&sem->count) & RWSEM_READ_FAILED_MASK)) {
if (IS_ERR(rwsem_down_read_failed_killable(sem)))
return -EINTR;
- DEBUG_RWSEMS_WARN_ON(!((unsigned long)sem->owner &
- RWSEM_READER_OWNED), sem);
+ DEBUG_RWSEMS_WARN_ON(!is_rwsem_reader_owned(sem), sem);
} else {
rwsem_set_reader_owned(sem);
}
@@ -1174,8 +1200,7 @@ inline void __up_read(struct rw_semaphore *sem)
{
long tmp;
- DEBUG_RWSEMS_WARN_ON(!((unsigned long)sem->owner & RWSEM_READER_OWNED),
- sem);
+ DEBUG_RWSEMS_WARN_ON(!is_rwsem_reader_owned(sem), sem);
rwsem_clear_reader_owned(sem);
tmp = atomic_long_add_return_release(-RWSEM_READER_BIAS, &sem->count);
if (unlikely((tmp & (RWSEM_LOCK_MASK|RWSEM_FLAG_WAITERS))
@@ -1382,8 +1407,7 @@ EXPORT_SYMBOL(down_write_killable_nested);
void up_read_non_owner(struct rw_semaphore *sem)
{
- DEBUG_RWSEMS_WARN_ON(!((unsigned long)sem->owner & RWSEM_READER_OWNED),
- sem);
+ DEBUG_RWSEMS_WARN_ON(!is_rwsem_reader_owned(sem), sem);
__up_read(sem);
}
EXPORT_SYMBOL(up_read_non_owner);
--
2.18.1
next prev parent reply other threads:[~2019-04-13 17:24 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-13 17:22 [PATCH v4 00/16] locking/rwsem: Rwsem rearchitecture part 2 Waiman Long
2019-04-13 17:22 ` [PATCH v4 01/16] locking/rwsem: Prevent unneeded warning during locking selftest Waiman Long
2019-04-18 8:04 ` [tip:locking/core] " tip-bot for Waiman Long
2019-04-13 17:22 ` [PATCH v4 02/16] locking/rwsem: Make owner available even if !CONFIG_RWSEM_SPIN_ON_OWNER Waiman Long
2019-04-13 17:22 ` [PATCH v4 03/16] locking/rwsem: Remove rwsem_wake() wakeup optimization Waiman Long
2019-04-13 17:22 ` [PATCH v4 04/16] locking/rwsem: Implement a new locking scheme Waiman Long
2019-04-16 13:22 ` Peter Zijlstra
2019-04-16 13:32 ` Waiman Long
2019-04-16 14:18 ` Peter Zijlstra
2019-04-16 14:42 ` Peter Zijlstra
2019-04-13 17:22 ` [PATCH v4 05/16] locking/rwsem: Merge rwsem.h and rwsem-xadd.c into rwsem.c Waiman Long
2019-04-13 17:22 ` [PATCH v4 06/16] locking/rwsem: Code cleanup after files merging Waiman Long
2019-04-16 16:01 ` Peter Zijlstra
2019-04-16 16:17 ` Peter Zijlstra
2019-04-16 19:45 ` Waiman Long
2019-04-13 17:22 ` [PATCH v4 07/16] locking/rwsem: Implement lock handoff to prevent lock starvation Waiman Long
2019-04-16 14:12 ` Peter Zijlstra
2019-04-16 20:26 ` Waiman Long
2019-04-16 21:07 ` Waiman Long
2019-04-17 7:13 ` Peter Zijlstra
2019-04-17 16:22 ` Waiman Long
2019-04-16 15:49 ` Peter Zijlstra
2019-04-16 16:15 ` Peter Zijlstra
2019-04-16 18:41 ` Waiman Long
2019-04-16 18:16 ` Waiman Long
2019-04-16 18:32 ` Peter Zijlstra
2019-04-17 7:35 ` Peter Zijlstra
2019-04-17 16:35 ` Waiman Long
2019-04-17 8:05 ` Peter Zijlstra
2019-04-17 16:39 ` Waiman Long
2019-04-18 8:22 ` Peter Zijlstra
2019-04-17 8:17 ` Peter Zijlstra
2019-04-13 17:22 ` [PATCH v4 08/16] locking/rwsem: Make rwsem_spin_on_owner() return owner state Waiman Long
2019-04-17 9:00 ` Peter Zijlstra
2019-04-17 16:42 ` Waiman Long
2019-04-17 10:19 ` Peter Zijlstra
2019-04-17 16:53 ` Waiman Long
2019-04-17 12:41 ` Peter Zijlstra
2019-04-17 12:47 ` Peter Zijlstra
2019-04-17 18:29 ` Waiman Long
2019-04-18 8:39 ` Peter Zijlstra
2019-04-17 13:00 ` Peter Zijlstra
2019-04-17 18:50 ` Waiman Long
2019-04-13 17:22 ` [PATCH v4 09/16] locking/rwsem: Ensure an RT task will not spin on reader Waiman Long
2019-04-17 13:18 ` Peter Zijlstra
2019-04-17 18:47 ` Waiman Long
2019-04-18 8:52 ` Peter Zijlstra
2019-04-18 13:27 ` Waiman Long
2019-04-13 17:22 ` [PATCH v4 10/16] locking/rwsem: Wake up almost all readers in wait queue Waiman Long
2019-04-16 16:50 ` Davidlohr Bueso
2019-04-16 17:37 ` Waiman Long
2019-04-17 13:39 ` Peter Zijlstra
2019-04-17 17:16 ` Waiman Long
2019-04-13 17:22 ` [PATCH v4 11/16] locking/rwsem: Enable readers spinning on writer Waiman Long
2019-04-17 13:56 ` Peter Zijlstra
2019-04-17 17:34 ` Waiman Long
2019-04-18 8:57 ` Peter Zijlstra
2019-04-18 14:35 ` Waiman Long
2019-04-17 13:58 ` Peter Zijlstra
2019-04-17 17:45 ` Waiman Long
2019-04-18 9:00 ` Peter Zijlstra
2019-04-18 13:40 ` Waiman Long
2019-04-17 14:05 ` Peter Zijlstra
2019-04-17 17:51 ` Waiman Long
2019-04-18 9:11 ` Peter Zijlstra
2019-04-18 14:37 ` Waiman Long
2019-04-13 17:22 ` [PATCH v4 12/16] locking/rwsem: Enable time-based spinning on reader-owned rwsem Waiman Long
2019-04-18 13:06 ` Peter Zijlstra
2019-04-18 15:15 ` Waiman Long
2019-04-19 7:56 ` Peter Zijlstra
2019-04-19 14:33 ` Waiman Long
2019-04-19 15:36 ` Waiman Long
2019-04-13 17:22 ` Waiman Long [this message]
2019-04-13 17:22 ` [PATCH v4 14/16] locking/rwsem: Guard against making count negative Waiman Long
2019-04-18 13:51 ` Peter Zijlstra
2019-04-18 14:08 ` Waiman Long
2019-04-18 14:30 ` Peter Zijlstra
2019-04-18 14:40 ` Peter Zijlstra
2019-04-18 14:54 ` Waiman Long
2019-04-19 10:26 ` Peter Zijlstra
2019-04-19 12:02 ` Peter Zijlstra
2019-04-19 13:03 ` Peter Zijlstra
2019-04-19 13:15 ` Peter Zijlstra
2019-04-19 19:39 ` Waiman Long
2019-04-21 21:07 ` Waiman Long
2019-04-23 14:17 ` Peter Zijlstra
2019-04-23 14:31 ` Waiman Long
2019-04-23 16:27 ` Linus Torvalds
2019-04-23 19:12 ` Waiman Long
2019-04-23 19:34 ` Peter Zijlstra
2019-04-23 19:41 ` Waiman Long
2019-04-23 19:55 ` [PATCH] bpf: Fix preempt_enable_no_resched() abuse Peter Zijlstra
2019-04-23 20:03 ` [PATCH] trace: " Peter Zijlstra
2019-04-23 23:58 ` Steven Rostedt
2019-04-29 6:39 ` [tip:sched/core] " tip-bot for Peter Zijlstra
2019-04-29 13:31 ` Steven Rostedt
2019-04-29 14:08 ` Ingo Molnar
2019-04-23 20:27 ` [PATCH] bpf: " Linus Torvalds
2019-04-23 20:35 ` Peter Zijlstra
2019-04-23 20:45 ` Linus Torvalds
2019-04-24 13:19 ` Peter Zijlstra
2019-04-25 21:23 ` Alexei Starovoitov
2019-04-26 7:14 ` Peter Zijlstra
2019-04-24 7:09 ` [PATCH v4 14/16] locking/rwsem: Guard against making count negative Peter Zijlstra
2019-04-24 16:49 ` Waiman Long
2019-04-24 17:01 ` Peter Zijlstra
2019-04-24 17:10 ` Waiman Long
2019-04-24 17:56 ` Linus Torvalds
2019-04-13 17:22 ` [PATCH v4 15/16] locking/rwsem: Merge owner into count on x86-64 Waiman Long
2019-04-18 14:28 ` Peter Zijlstra
2019-04-18 14:40 ` Waiman Long
2019-04-13 17:22 ` [PATCH v4 16/16] locking/rwsem: Remove redundant computation of writer lock word Waiman Long
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190413172259.2740-14-longman@redhat.com \
--to=longman@redhat.com \
--cc=dave@stgolabs.net \
--cc=huang.ying.caritas@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tim.c.chen@linux.intel.com \
--cc=torvalds@linux-foundation.org \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).