Alt+SysRq+K broken
Subsystems (3)
kernel BUG at kernel/workqueue.c:212! 100% reproducable
queue_work __handle_sysrq kbd_event add_timer_randomness kbd_event input_event atkbd_interrupt serio_interrupt i8042_interrupt ...
reverting the following patch make it work again.
commit 8b6312f4dcc1efe7975731b6c47dd134282bd9ac
Author: Eric W. Biederman <[email protected]> Date: Sat Feb 10 01:44:34 2007 -0800
[PATCH] vt: refactor console SAK processing
This does several things.
- It moves looking up of the current foreground console into process context where we can safely take the semaphore that protects this operation.
- It uses the new flavor of work queue processing.
- This generates a factor of do_SAK, __do_SAK that runs immediately.
- This calls __do_SAK with the console semaphore held ensuring nothing else happens to the console while we process the SAK operation.
- With the console SAK processing moved into process context this patch removes the xchg operations that I used to attempt to attomically update struct pid, because of the strange locking used in the SAK processing. With SAK using the normal console semaphore nothing special is needed.
drivers/char/keyboard.c +3 -9
@@ -595,15 +595,9 @@ static void fn_spawn_con(struct vc_datastatic void fn_SAK (struct vc_data *vc) { -struct tty_struct *tty = vc->vc_tty; - -/* -* SAK should also work in all raw modes and reset -* them properly. -*/ -if (tty) -do_SAK (tty); -reset_vc (vc); +struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work; +PREPARE_WORK (SAK_work, vc_SAK); +schedule_work (SAK_work); }static void fn_null (struct vc_data *vc)
drivers/char/sysrq.c +3 -3
@@ -88,9 +88,9 @@ static struct sysrq_key_op sysrq_logleve#ifdef CONFIG_VT static void sysrq_handle_SAK (int key,struct tty_struct *tty) { -if (tty) -do_SAK (tty); -reset_vc (vc_cons[fg_console].d); +struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work; +PREPARE_WORK (SAK_work, vc_SAK); +schedule_work (SAK_work); }static struct sysrq_key_op sysrq_SAK_op = { .handler = sysrq_handle_SAK,
drivers/char/tty_io.c +9 -4
@@ -3324,10 +3324,8 @@ #endif* Nasty bug: do_SAK is being called in interrupt context. This can * deadlock. We punt it up to process context. AKPM - 16Mar2001 */ -static void __do_SAK (struct work_struct *work) +void __do_SAK (struct tty_struct *tty) { -struct tty_struct *tty = - container_of(work, struct tty_struct, SAK_work);#ifdef TTY_SOFT_SAK tty_hangup (tty);#else
@@ -3394,6 +3392,13 @@ #else#endif } +static void do_SAK_work (struct work_struct *work) +{ +struct tty_struct *tty = + container_of(work, struct tty_struct, SAK_work); +__do_SAK (tty); +} +/* * The tq handling here is a little racy - tty->SAK_work may already be queued. * Fortunately we don't need to worry, because if ->SAK_work is already queued,
@@ -3404,7 +3409,7 @@ void do_SAK(struct tty_struct *tty) {if (!tty)return ; -PREPARE_WORK (&tty->SAK_work, __do_SAK); +PREPARE_WORK (&tty->SAK_work, do_SAK_work);schedule_work (&tty->SAK_work); }
drivers/char/vt_ioctl.c +26 -2
@@ -672,7 +672,8 @@ #endif vc->vt_mode = tmp;/* the frsig is ignored, so we set it to 0 */ vc->vt_mode.frsig =0 ; -put_pid (xchg (&vc->vt_pid,get_pid (task_pid (current)))); +put_pid (vc->vt_pid); + vc->vt_pid =get_pid (task_pid (current));/* no switch is required -- [email protected] */ vc->vt_newvt =-1 ;release_console_sem ();
@@ -1063,12 +1064,35 @@ void reset_vc(struct vc_data *vc) vc->vt_mode.relsig =0 ; vc->vt_mode.acqsig =0 ; vc->vt_mode.frsig =0 ; -put_pid (xchg (&vc->vt_pid,NULL )); +put_pid (vc->vt_pid); + vc->vt_pid =NULL ; vc->vt_newvt =-1 ;if (!in_interrupt ())/* Via keyboard.c:SAK() - akpm */ reset_palette (vc); } +void vc_SAK (struct work_struct *work) +{ +struct vc *vc_con = + container_of(work, struct vc, SAK_work); +struct vc_data *vc; +struct tty_struct *tty; + +acquire_console_sem (); + vc = vc_con->d; +if (vc) { + tty = vc->vc_tty; +/* +* SAK should also work in all raw modes and reset +* them properly. +*/ +if (tty) +__do_SAK (tty); +reset_vc (vc); + } +release_console_sem (); +} +/* * Performs the back end of a vt switch */
include/linux/console_struct.h +3 -0
@@ -11,6 +11,7 @@#include <linux/wait.h> #include <linux/vt.h> +#include <linux/workqueue.h> struct vt_struct ;
@@ -103,6 +104,7 @@ struct vc_data {struct vc {struct vc_data *d; +struct work_struct SAK_work;/* might add scrmem, vt_struct, kbd at some time, to have everything in one place - the disadvantage
@@ -110,6 +112,7 @@ struct vc { };extern struct vc vc_cons [MAX_NR_CONSOLES ]; +extern void vc_SAK (struct work_struct *work);#define CUR_DEF 0#define CUR_NONE 1
include/linux/tty.h +1 -0
@@ -291,6 +291,7 @@ extern void tty_vhangup(struct tty_strucextern void tty_unhangup (struct file *filp);extern int tty_hung_up_p (struct file * filp);extern void do_SAK (struct tty_struct *tty); +extern void __do_SAK (struct tty_struct *tty);extern void disassociate_ctty (int priv);extern void tty_flip_buffer_push (struct tty_struct *tty);extern speed_t tty_get_baud_rate (struct tty_struct *tty);
Quoted 13 lines · Alexey Dobriyan
kernel BUG at
kernel/workqueue.c:212! 100% reproducablequeue_work __handle_sysrq kbd_event add_timer_randomness kbd_event input_event atkbd_interrupt serio_interrupt i8042_interrupt ...
Quoted 1 line
reverting the following patch make it work again.
Thanks,
I wrote the patch just before the big set of work queue changes, and had to fix it to work with the new style of work queues when it went it Andrews tree. It looks like the work queue api continued to change and my patch bit rotted.
I will take a look and see what it takes to updated the code to the current API.
I'm pretty certain a s/PREPARE_WORK/INIT_WORK/g would make it work but I'm not certain that is correct.
Eric
PATCH 1/1 Fix SAK_work workqueue initialization.
In reply to Alexey DobriyanSomewhere in the rewrite of the work queues my cleanup of SAK handling got broken. Maybe I didn't retest it properly or possibly the API was changing so fast I missed something. Regardless currently triggering a SAK now generates an ugly BUG_ON and kills the kernel.
Thanks to Alexey Dobriyan <[email protected]> for spotting this.
This modifies the use of SAK_work to initialize it when the data structure it resides in is initialized, and to simply call schedule_work when we need to generate a SAK. I update both data structures that have a SAK_work member for consistency.
All of the old PREPARE_WORK calls that are now gone.
If we call schedule_work again before it has processed it has generated the first SAK it will simply ignore the duplicate schedule_work request.
--- drivers/char/keyboard.c | 1 - drivers/char/sysrq.c | 1 - drivers/char/tty_io.c | 3 +-- drivers/char/vt.c | 1 + 4 files changed, 2 insertions(+), 4 deletions(-)
drivers/char/keyboard.c +0 -1
@@ -596,7 +596,6 @@ static void fn_spawn_con(struct vc_data *vc)static void fn_SAK (struct vc_data *vc) {struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work; -PREPARE_WORK (SAK_work, vc_SAK);schedule_work (SAK_work); }
drivers/char/sysrq.c +0 -1
@@ -89,7 +89,6 @@ static struct sysrq_key_op sysrq_loglevel_op = {static void sysrq_handle_SAK (int key,struct tty_struct *tty) {struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work; -PREPARE_WORK (SAK_work, vc_SAK);schedule_work (SAK_work); }static struct sysrq_key_op sysrq_SAK_op = {
drivers/char/tty_io.c +1 -2
@@ -3442,7 +3442,6 @@ void do_SAK(struct tty_struct *tty) {if (!tty)return ; -PREPARE_WORK (&tty->SAK_work, do_SAK_work);schedule_work (&tty->SAK_work); }
@@ -3568,7 +3567,7 @@ static void initialize_tty_struct(struct tty_struct *tty)mutex_init (&tty->atomic_write_lock);spin_lock_init (&tty->read_lock);INIT_LIST_HEAD (&tty->tty_files); -INIT_WORK (&tty->SAK_work,NULL ); +INIT_WORK (&tty->SAK_work, do_SAK_work); }/*
drivers/char/vt.c +1 -0
@@ -2635,6 +2635,7 @@ static int __init con_init(void)*/ for (currcons =0 ; currcons <MIN_NR_CONSOLES ; currcons++) { vc_cons[currcons].d = vc =alloc_bootmem (sizeof (struct vc_data )); +INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK);visual_init (vc, currcons,1 ); vc->vc_screenbuf = (unsigned short *)alloc_bootmem (vc->vc_screenbuf_size); vc->vc_kmalloced =0 ;
Signature · 1 line
1.4.4.1.g278f