LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Peter Zijlstra <peterz@infradead.org>
To: Waiman Long <longman@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Davidlohr Bueso <dave@stgolabs.net>,
"Theodore Y. Ts'o" <tytso@mit.edu>,
Oleg Nesterov <oleg@redhat.com>,
Amir Goldstein <amir73il@gmail.com>, Jan Kara <jack@suse.cz>,
Matthew Wilcox <willy@infradead.org>
Subject: Re: [PATCH v3 1/2] locking/rwsem: Add a new RWSEM_ANONYMOUSLY_OWNED flag
Date: Tue, 15 May 2018 20:02:56 +0200 [thread overview]
Message-ID: <20180515180256.GO12217@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <1526405884-4860-2-git-send-email-longman@redhat.com>
On Tue, May 15, 2018 at 01:38:03PM -0400, Waiman Long wrote:
> diff --git a/kernel/locking/rwsem-xadd.c b/kernel/locking/rwsem-xadd.c
> index e795908..a27dbb4 100644
> --- a/kernel/locking/rwsem-xadd.c
> +++ b/kernel/locking/rwsem-xadd.c
> @@ -357,11 +357,8 @@ static inline bool rwsem_can_spin_on_owner(struct rw_semaphore *sem)
>
> rcu_read_lock();
> owner = READ_ONCE(sem->owner);
> - if (!rwsem_owner_is_writer(owner)) {
> - /*
> - * Don't spin if the rwsem is readers owned.
> - */
> - ret = !rwsem_owner_is_reader(owner);
> + if (!owner || !is_rwsem_owner_spinnable(owner)) {
> + ret = !owner; /* !owner is spinnable */
> goto done;
> }
>
> @@ -382,8 +379,10 @@ static noinline bool rwsem_spin_on_owner(struct rw_semaphore *sem)
> {
> struct task_struct *owner = READ_ONCE(sem->owner);
>
> - if (!rwsem_owner_is_writer(owner))
> - goto out;
> + if (!owner)
> + return true;
> + else if (!is_rwsem_owner_spinnable(owner))
> + return false;
s/else //
> rcu_read_lock();
> while (sem->owner == owner) {
> @@ -408,12 +407,12 @@ static noinline bool rwsem_spin_on_owner(struct rw_semaphore *sem)
> cpu_relax();
> }
> rcu_read_unlock();
> -out:
> +
> /*
> * If there is a new owner or the owner is not set, we continue
> * spinning.
> */
> - return !rwsem_owner_is_reader(READ_ONCE(sem->owner));
> + return is_rwsem_owner_spinnable(READ_ONCE(sem->owner));
> }
The above two cases have explicit owner tests, this one doesn't.
Now I know it works, but maybe:
return !owner || is_rwsem_owner_spinnable(owner);
is easier to read... dunno.
next prev parent reply other threads:[~2018-05-15 18:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-15 17:38 [PATCH v3 0/2] locking/rwsem: Fix DEBUG_RWSEM warning from thaw_super() Waiman Long
2018-05-15 17:38 ` [PATCH v3 1/2] locking/rwsem: Add a new RWSEM_ANONYMOUSLY_OWNED flag Waiman Long
2018-05-15 17:46 ` Peter Zijlstra
2018-05-15 17:48 ` Waiman Long
2018-05-15 17:48 ` Peter Zijlstra
2018-05-15 17:52 ` Waiman Long
2018-05-15 17:55 ` Peter Zijlstra
2018-05-15 17:56 ` Waiman Long
2018-05-15 18:02 ` Peter Zijlstra [this message]
2018-05-15 17:38 ` [PATCH v3 2/2] locking/percpu-rwsem: Annotate rwsem ownership transfer by setting RWSEM_OWNER_UNKNOWN Waiman Long
2018-05-15 17:58 ` Peter Zijlstra
2018-05-15 18:02 ` Waiman Long
2018-05-15 18:05 ` Amir Goldstein
2018-05-15 18:45 ` Waiman Long
2018-05-15 18:05 ` Peter Zijlstra
2018-05-15 18:35 ` Waiman Long
2018-05-15 18:02 ` Matthew Wilcox
2018-05-15 18:07 ` Peter Zijlstra
2018-05-15 18:45 ` Waiman Long
2018-05-15 21:21 ` Matthew Wilcox
2018-05-15 21:30 ` 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=20180515180256.GO12217@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=amir73il@gmail.com \
--cc=dave@stgolabs.net \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=tglx@linutronix.de \
--cc=tytso@mit.edu \
--cc=willy@infradead.org \
--subject='Re: [PATCH v3 1/2] locking/rwsem: Add a new RWSEM_ANONYMOUSLY_OWNED flag' \
/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
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).