UML - DEBUG_SHIRQ fixes
PATCH 6/20 UML - DEBUG_SHIRQ fixes
A couple more DEBUG_SHIRQ fixes.
The previous mconsole blocking fix exposed the lack of O_NONBLOCK on the mconsole socket.
Also, winch_interrupt started crashing because it is called at irq free time and it tries to dereference tty->driver_data, which has already been set to NULL.
I added some error cleanup in mconsole_init while I was there.
--- arch/um/drivers/line.c | 8 +++++--- arch/um/drivers/mconsole_kern.c | 8 +++++++- 2 files changed, 12 insertions(+), 4 deletions(-)
arch/um/drivers/line.c +5 -3
@@ -774,9 +774,11 @@ static irqreturn_t winch_interrupt(int i tty = winch->tty;if (tty !=NULL ) { line = tty->driver_data; -chan_window_size (&line->chan_list, &tty->winsize.ws_row, - &tty->winsize.ws_col); -kill_pgrp (tty->pgrp,SIGWINCH ,1 ); +if (line !=NULL ) { +chan_window_size (&line->chan_list, &tty->winsize.ws_row, + &tty->winsize.ws_col); +kill_pgrp (tty->pgrp,SIGWINCH ,1 ); + } } out:if (winch->fd !=-1 )
arch/um/drivers/mconsole_kern.c +7 -1
@@ -792,6 +792,8 @@ static int __init mconsole_init(void)printk (KERN_ERR "Failed to initialize management console\n" );return 1 ; } +if (os_set_fd_block (sock,0 )) + goto out;register_reboot_notifier (&reboot_notifier);
@@ -800,7 +802,7 @@ static int __init mconsole_init(void) "mconsole", (void *)sock);if (err) {printk (KERN_ERR "Failed to get IRQ for management console\n" ); -return 1 ; + goto out; }if (notify_socket !=NULL ) {
@@ -816,6 +818,10 @@ static int __init mconsole_init(void)printk (KERN_INFO "mconsole (version %d) initialized on %s\n" ,MCONSOLE_VERSION , mconsole_socket_name);return 0 ; + + out: +os_close_file (sock); +return 1 ; }__initcall (mconsole_init);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel