From: Peter Zijlstra <peterz@infradead.org>
To: Waiman Long <longman@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>, Will Deacon <will.deacon@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
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>
Subject: Re: [PATCH v4 08/16] locking/rwsem: Make rwsem_spin_on_owner() return owner state
Date: Wed, 17 Apr 2019 14:41:01 +0200 [thread overview]
Message-ID: <20190417124101.GE4038@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20190413172259.2740-9-longman@redhat.com>
On Sat, Apr 13, 2019 at 01:22:51PM -0400, Waiman Long wrote:
> In the special case that there is no active lock and the handoff bit
> is set, optimistic spinning has to be stopped.
> @@ -500,9 +521,19 @@ static noinline bool rwsem_spin_on_owner(struct rw_semaphore *sem)
>
> /*
> * If there is a new owner or the owner is not set, we continue
> - * spinning.
> + * spinning except when here is no active locks and the handoff bit
> + * is set. In this case, we have to stop spinning.
> */
> - return is_rwsem_owner_spinnable(READ_ONCE(sem->owner));
> + owner = READ_ONCE(sem->owner);
> + if (!is_rwsem_owner_spinnable(owner))
> + return OWNER_NONSPINNABLE;
> + if (owner && !is_rwsem_owner_reader(owner))
> + return OWNER_WRITER;
> +
> + count = atomic_long_read(&sem->count);
> + if (RWSEM_COUNT_HANDOFF(count) && !RWSEM_COUNT_LOCKED(count))
> + return OWNER_NONSPINNABLE;
> + return !owner ? OWNER_NULL : OWNER_READER;
> }
So this fixes a straight up bug in the last patch (and thus should be
done before so the bug never exists), and creates unreadable code while
at it.
Also, I think only checking HANDOFF after the loop is wrong; the moment
HANDOFF happens you have to terminate the loop, irrespective of what
@owner does.
Does something like so work?
---
enum owner_state {
OWNER_NULL = 1 << 0,
OWNER_WRITER = 1 << 1,
OWNER_READER = 1 << 2,
OWNER_NONSPINNABLE = 1 << 3,
};
#define OWNER_SPINNABLE (OWNER_NULL | OWNER_WRITER)
static inline enum owner_state rwsem_owner_state(unsigned long owner)
{
if (!owner)
return OWNER_NULL;
if (owner & RWSEM_ANONYMOUSLY_OWNED)
return OWNER_NONSPINNABLE;
if (owner & RWSEM_READER_OWNER)
return OWNER_READER;
return OWNER_WRITER;
}
static noinline enum owner_state rwsem_spin_on_owner(struct rw_semaphore *sem)
{
struct task_struct *tmp, *owner = READ_ONCE(sem->owner);
enum owner_state state;
rcu_read_lock();
for (;;) {
state = rwsem_owner_state((unsigned long)owner);
if (!(state & OWNER_SPINNABLE))
break;
if (atomic_long_read(&sem->count) & RWSEM_FLAG_HANDOFF) {
state = OWNER_NONSPINNABLE;
break;
}
tmp = READ_ONCE(sem->owner);
if (tmp != owner) {
state = rwsem_owner_state((unsigned long)tmp);
break;
}
/*
* Ensure we emit the owner->on_cpu, dereference _after_
* checking sem->owner still matches owner, if that fails,
* owner might point to free()d memory, if it still matches,
* the rcu_read_lock() ensures the memory stays valid.
*/
barrier();
if (need_resched() || !owner_on_cpu(owner)) {
state = OWNER_NONSPINNABLE;
break;
}
cpu_relax();
}
rcu_read_unlock();
return state;
}
next prev parent reply other threads:[~2019-04-17 12:41 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 [this message]
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 ` [PATCH v4 13/16] locking/rwsem: Add more rwsem owner access helpers Waiman Long
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=20190417124101.GE4038@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=dave@stgolabs.net \
--cc=huang.ying.caritas@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@redhat.com \
--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).