locking/arch: Move qrwlock.h include after qspinlock.h
authorWaiman Long <longman@redhat.com>
Wed, 10 Feb 2021 18:16:31 +0000 (13:16 -0500)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 11 Feb 2021 12:59:54 +0000 (07:59 -0500)
commitd8d0da4eee5c4e86ea08abde6975848376b4ac13
treedf7d562b9d39161d947da8ddd68f07f0cfda43d7
parent9294b8a12585f8b4ccb9c060b54bab0bd13f24b9
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: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Waiman Long <longman@redhat.com>
Fixes: 26128cb6c7e6 ("locking/rwlocks: Add contention detection for rwlocks")
Tested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Ben Gardon <bgardon@google.com>
[Add arch/sparc and kernel/locking parts per discussion with Waiman. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/arm64/include/asm/spinlock.h
arch/mips/include/asm/spinlock.h
arch/sparc/include/asm/spinlock_64.h
arch/xtensa/include/asm/spinlock.h
include/asm-generic/qrwlock.h
kernel/locking/qrwlock.c