From: Juergen Gross Date: Wed, 8 Jan 2020 10:43:24 +0000 (+0100) Subject: xen/spinlock: disable spinlock debugging in console_force_unlock() X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~917 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f3b5ba34ceae42354d0cc321224029cad4f4dcc3;p=xen.git xen/spinlock: disable spinlock debugging in console_force_unlock() console_force_unlock() might result in subsequent ASSERT() triggering when CONFIG_DEBUG_LOCKS was active. Avoid that by calling spin_debug_disable() in console_force_unlock() and make the spinlock debug assertions trigger only if spin_debug was active. Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index ed69f0a4d2..286f916bca 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -85,7 +85,8 @@ static void got_lock(union lock_debug *debug) static void rel_lock(union lock_debug *debug) { - ASSERT(debug->cpu == smp_processor_id()); + if ( atomic_read(&spin_debug) > 0 ) + ASSERT(debug->cpu == smp_processor_id()); debug->cpu = SPINLOCK_NO_CPU; } diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index b31d789a5d..4bcbbfa7d6 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1077,6 +1077,7 @@ void console_unlock_recursive_irqrestore(unsigned long flags) void console_force_unlock(void) { watchdog_disable(); + spin_debug_disable(); spin_lock_init(&console_lock); serial_force_unlock(sercon_handle); console_locks_busted = 1;