[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1d7d564c-cc73-372b-be8b-1cfd51cf476c@redhat.com>
Date: Wed, 10 Feb 2021 19:28:56 +0100
From: Paolo Bonzini <pbonzini@...hat.com>
To: Waiman Long <longman@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>, Will Deacon <will@...nel.org>,
Catalin Marinas <catalin.marinas@....com>,
Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
Chris Zankel <chris@...kel.net>,
Max Filippov <jcmvbkbc@...il.com>
Cc: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mips@...r.kernel.org, linux-xtensa@...ux-xtensa.org,
Naresh Kamboju <naresh.kamboju@...aro.org>,
Guenter Roeck <linux@...ck-us.net>,
Ben Gardon <bgardon@...gle.com>
Subject: Re: [PATCH] locking/arch: Move qrwlock.h include after qspinlock.h
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@...hat.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()
>
>
Powered by blists - more mailing lists