# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1292414674 0
# Node ID a3a29e67aa7e75a094e1b4237b10a68cf829b542
# Parent 16673224c1cc2ca3bb9730f1d7c84fe4d96e5323
Reduce side effects of handling '*' debug key
NMI watchdog should be suppressed when dumping IRQ handlers. Softirqs
should be handled periodically while processing non-IRQ handlers.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
xen/common/keyhandler.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff -r 16673224c1cc -r a3a29e67aa7e xen/common/keyhandler.c
--- a/xen/common/keyhandler.c Wed Dec 15 11:59:00 2010 +0000
+++ b/xen/common/keyhandler.c Wed Dec 15 12:04:34 2010 +0000
@@ -444,16 +444,15 @@ static void run_all_nonirq_keyhandlers(u
struct keyhandler *h;
int k;
- console_start_log_everything();
for ( k = 0; k < ARRAY_SIZE(key_table); k++ )
{
+ process_pending_softirqs();
h = key_table[k];
if ( (h == NULL) || !h->diagnostic || h->irq_callback )
continue;
printk("[%c: %s]\n", k, h->desc);
(*h->u.fn)(k);
}
- console_end_log_everything();
}
static DECLARE_TASKLET(run_all_keyhandlers_tasklet,
@@ -464,10 +463,11 @@ static void run_all_keyhandlers(unsigned
struct keyhandler *h;
int k;
+ watchdog_disable();
+
printk("'%c' pressed -> firing all diagnostic keyhandlers\n", key);
/* Fire all the IRQ-context diangostic keyhandlers now */
- console_start_log_everything();
for ( k = 0; k < ARRAY_SIZE(key_table); k++ )
{
h = key_table[k];
@@ -476,7 +476,8 @@ static void run_all_keyhandlers(unsigned
printk("[%c: %s]\n", k, h->desc);
(*h->u.irq_fn)(k, regs);
}
- console_end_log_everything();
+
+ watchdog_enable();
/* Trigger the others from a tasklet in non-IRQ context */
tasklet_schedule(&run_all_keyhandlers_tasklet);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home