From 7b9fa702ca323164d6b49e8b639a57f880454a8c Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 13 Aug 2013 14:31:01 +0200 Subject: watchdog/crash: Always disable watchdog in console_force_unlock() Depending on the state of the conring and serial_tx_buffer, console_force_unlock() can be a long running operation, usually because of serial_start_sync() XenServer testing has found a reliable case where console_force_unlock() on one PCPU takes long enough for another PCPU to timeout due to the watchdog (such as waiting for a tlb flush callin). The watchdog timeout causes the second PCPU to repeat the console_force_unlock(), at which point the first PCPU typically fails an assertion in spin_unlock_irqrestore(&port->tx_lock) (because the tx_lock has been unlocked behind itself). console_force_unlock() is only on emergency paths, so one way or another the host is going down. Disable the watchdog before forcing the console lock to help prevent having pcpus completing with each other to bring the host down. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/drivers/char/console.c | 1 + 1 file changed, 1 insertion(+) (limited to 'xen/drivers') diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 52ffa70ec2..e47ddf21cc 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -737,6 +737,7 @@ void console_end_log_everything(void) void console_force_unlock(void) { + watchdog_disable(); spin_lock_init(&console_lock); serial_force_unlock(sercon_handle); console_locks_busted = 1; -- cgit v1.2.3