locking fix
Linus,
Please pull the latest locking-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-for-linus
# HEAD: cba77f03f2c7b6cc0b0a44a3c679e0abade7da62 locking/pvqspinlock: Fix kernel panic in locking-selftest
A single fix for a locking self-test crash.
Thanks,
Ingo
------------------>
Waiman Long (1):
locking/pvqspinlock: Fix kernel panic in locking-selftest
kernel/locking/qspinlock_paravirt.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
kernel/locking/qspinlock_paravirt.h +10 -1
@@ -4,6 +4,7 @@#include <linux/hash.h> #include <linux/bootmem.h> +#include <linux/debug_locks.h> /* * Implement paravirt qspinlocks; the general idea is to halt the vcpus instead
@@ -286,15 +287,23 @@ __visible void __pv_queued_spin_unlock(struct qspinlock *lock) {struct __qspinlock *l = (void *)lock;struct pv_node *node; +u8 lockval =cmpxchg (&l->locked, _Q_LOCKED_VAL,0 );/* * We must not unlock if SLOW, because in that case we must first * unhash. Otherwise it would be possible to have multiple @lock * entries, which would be BAD. */ -if (likely (cmpxchg (&l->locked, _Q_LOCKED_VAL,0 ) == _Q_LOCKED_VAL)) +if (likely (lockval == _Q_LOCKED_VAL))return ; +if (unlikely (lockval != _Q_SLOW_VAL)) { +if (debug_locks_silent) +return ; +WARN (1 ,"pvqspinlock: lock %p has corrupted value 0x%x!\n" , lock,atomic_read (&lock->val)); +return ; + } +/* * Since the above failed to release, this must be the SLOW path. * Therefore start by looking up the blocked node and unhashing it.