Re: PATCH: Minimal fix for sysrq on serial console hang

[Russell King]

On Wed, Jul 12, 2006 at 02:54:21PM +0100, Alan Cox wrote:
> When I originally did this change I used oops_in_progress as a locking
> guide. However it turns out there is one other place that turns all the
> locking on its head and that is sysrq.

Well, akpm's had a fix in his tree for some time, which he's been
pestering me with, so I committed that a few days ago:

# Author:    Andrew Morton (Fri Jun 30 10:29:59 BST 2006)
# Committer: Russell King (Sun Jul  9 21:11:10 BST 2006)
#	
#	[SERIAL] 8250: sysrq deadlock fix
#	
#	Fix http://bugzilla.kernel.org/show_bug.cgi?id=6716
#	
#	Doing a sysrq over a serial line into an SMP machine presently deadlocks.
#	
#	Signed-off-by: Andrew Morton
#	Signed-off-by: Russell King
#
#	 drivers/serial/8250.c |   13 +++++++++----
#	 1 files changed, 9 insertions(+), 4 deletions(-)
#
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 0995430..0ae9ced 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2240,10 +2252,14 @@ serial8250_console_write(struct console 
 
 	touch_nmi_watchdog();
 
-	if (oops_in_progress) {
-		locked = spin_trylock_irqsave(&up->port.lock, flags);
+	local_irq_save(flags);
+	if (up->port.sysrq) {
+		/* serial8250_handle_port() already took the lock */
+		locked = 0;
+	} else if (oops_in_progress) {
+		locked = spin_trylock(&up->port.lock);
 	} else
-		spin_lock_irqsave(&up->port.lock, flags);
+		spin_lock(&up->port.lock);
 
 	/*
 	 *	First save the IER then disable the interrupts
@@ -2265,7 +2281,8 @@ serial8250_console_write(struct console 
 	serial_out(up, UART_IER, ier);
 
 	if (locked)
-		spin_unlock_irqrestore(&up->port.lock, flags);
+		spin_unlock(&up->port.lock);
+	local_irq_restore(flags);
 }
 
 static int serial8250_console_setup(struct console *co, char *options)


-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/