Commit d8d0da4e authored by Waiman Long's avatar Waiman Long Committed by Paolo Bonzini
Browse files

locking/arch: Move qrwlock.h include after qspinlock.h 



include/asm-generic/qrwlock.h was trying to get arch_spin_is_locked via
asm-generic/qspinlock.h.  However, this does not work because architectures
might be using queued rwlocks but not queued spinlocks (csky), or because they
might be defining their own queued_* macros before including asm/qspinlock.h.

To fix this, ensure that asm/spinlock.h always includes qrwlock.h after
defining arch_spin_is_locked (either directly for csky, or via
asm/qspinlock.h for other architectures).  The only inclusion elsewhere
is in kernel/locking/qrwlock.c.  That one is really unnecessary because
the file is only compiled in SMP configurations (config QUEUED_RWLOCKS
depends on SMP) and in that case linux/spinlock.h already includes
asm/qrwlock.h if needed, via asm/spinlock.h.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWaiman Long <longman@redhat.com>
Fixes: 26128cb6 ("locking/rwlocks: Add contention detection for rwlocks")
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarBen Gardon <bgardon@google.com>
[Add arch/sparc and kernel/locking parts per discussion with Waiman. - Paolo]
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9294b8a1

arch/arm64/include/asm/spinlock.h

+1 −1
Original line number Diff line number Diff line
@@ -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()

arch/mips/include/asm/spinlock.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/sparc/include/asm/spinlock_64.h

+1 −1
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 


#include <asm/processor.h>

#include <asm/barrier.h>

#include <asm/qrwlock.h>

#include <asm/qspinlock.h>

#include <asm/qrwlock.h>



#endif /* !(__ASSEMBLY__) */

arch/xtensa/include/asm/spinlock.h

+1 −1
Original line number Diff line number Diff line
@@ -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()

include/asm-generic/qrwlock.h

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
#include <asm/processor.h>



#include <asm-generic/qrwlock_types.h>

#include <asm-generic/qspinlock.h>



/* Must be included from asm/spinlock.h after defining arch_spin_is_locked.  */



/*

 * Writer states & reader shift and bias.