From: Paolo Bonzini <pbonzini@redhat.com>
To: Waiman Long <longman@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, Will Deacon <will@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Chris Zankel <chris@zankel.net>,
Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org,
linux-xtensa@linux-xtensa.org,
Naresh Kamboju <naresh.kamboju@linaro.org>,
Guenter Roeck <linux@roeck-us.net>,
Ben Gardon <bgardon@google.com>
Subject: Re: [PATCH] locking/arch: Move qrwlock.h include after qspinlock.h
Date: Wed, 10 Feb 2021 19:28:56 +0100 [thread overview]
Message-ID: <1d7d564c-cc73-372b-be8b-1cfd51cf476c@redhat.com> (raw)
In-Reply-To: <20210210144556.10932-1-longman@redhat.com>
On 10/02/21 15:45, Waiman Long wrote:
> The queued rwlock code has a dependency on the current spinlock
> implementation (likely to be qspinlock), but not vice versa. Including
> qrwlock.h before qspinlock.h can be problematic when expanding qrwlock
> functionality.
>
> If both qspinlock.h and qrwlock.h are to be included, the qrwlock.h
> include should always be after qspinlock.h. Update the current set of
> asm/spinlock.h files to enforce that.
>
> Signed-off-by: Waiman Long <longman@redhat.com>
arch/sparc/include/asm/spinlock_64.h is missing. Also, the include in
kernel/locking/qrwlock.c is not necessary (it may be there for aesthetic
reasons, but it complicates thing in this case).
I'll send a v2 that is based on the kvm/next tree.
Paolo
> ---
> arch/arm64/include/asm/spinlock.h | 2 +-
> arch/mips/include/asm/spinlock.h | 2 +-
> arch/xtensa/include/asm/spinlock.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/include/asm/spinlock.h b/arch/arm64/include/asm/spinlock.h
> index 9083d6992603..0525c0b089ed 100644
> --- a/arch/arm64/include/asm/spinlock.h
> +++ b/arch/arm64/include/asm/spinlock.h
> @@ -5,8 +5,8 @@
> #ifndef __ASM_SPINLOCK_H
> #define __ASM_SPINLOCK_H
>
> -#include <asm/qrwlock.h>
> #include <asm/qspinlock.h>
> +#include <asm/qrwlock.h>
>
> /* See include/linux/spinlock.h */
> #define smp_mb__after_spinlock() smp_mb()
> diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h
> index 8a88eb265516..6ce2117e49f6 100644
> --- a/arch/mips/include/asm/spinlock.h
> +++ b/arch/mips/include/asm/spinlock.h
> @@ -10,7 +10,6 @@
> #define _ASM_SPINLOCK_H
>
> #include <asm/processor.h>
> -#include <asm/qrwlock.h>
>
> #include <asm-generic/qspinlock_types.h>
>
> @@ -27,5 +26,6 @@ static inline void queued_spin_unlock(struct qspinlock *lock)
> }
>
> #include <asm/qspinlock.h>
> +#include <asm/qrwlock.h>
>
> #endif /* _ASM_SPINLOCK_H */
> diff --git a/arch/xtensa/include/asm/spinlock.h b/arch/xtensa/include/asm/spinlock.h
> index 584b0de6f2ca..41c449ece2d8 100644
> --- a/arch/xtensa/include/asm/spinlock.h
> +++ b/arch/xtensa/include/asm/spinlock.h
> @@ -12,8 +12,8 @@
> #define _XTENSA_SPINLOCK_H
>
> #include <asm/barrier.h>
> -#include <asm/qrwlock.h>
> #include <asm/qspinlock.h>
> +#include <asm/qrwlock.h>
>
> #define smp_mb__after_spinlock() smp_mb()
>
>
next prev parent reply other threads:[~2021-02-10 18:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-10 14:45 [PATCH] locking/arch: Move qrwlock.h include after qspinlock.h Waiman Long
2021-02-10 15:05 ` Guenter Roeck
2021-02-10 15:53 ` Waiman Long
2021-02-10 17:33 ` Ben Gardon
2021-02-10 16:19 ` Thomas Bogendoerfer
2021-02-11 12:59 ` Paolo Bonzini
2021-02-11 14:41 ` Thomas Bogendoerfer
2021-02-10 18:28 ` Paolo Bonzini [this message]
2021-02-10 18:50 ` Waiman Long
-- strict thread matches above, loose matches on Subject: below --
2021-02-10 18:33 Paolo Bonzini
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=1d7d564c-cc73-372b-be8b-1cfd51cf476c@redhat.com \
--to=pbonzini@redhat.com \
--cc=bgardon@google.com \
--cc=catalin.marinas@arm.com \
--cc=chris@zankel.net \
--cc=jcmvbkbc@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@roeck-us.net \
--cc=longman@redhat.com \
--cc=mingo@redhat.com \
--cc=naresh.kamboju@linaro.org \
--cc=peterz@infradead.org \
--cc=tsbogend@alpha.franken.de \
--cc=will@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