diff options
author | Rik van Riel <riel@redhat.com> | 2014-06-06 17:38:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:08:17 -0400 |
commit | 722773afd83209d4088d30946bc274f547528a0b (patch) | |
tree | 991d1315b8345909e9d9fae4f881b168b4f48944 | |
parent | 984d74a72076a12b400339973e8c98fd2fcd90e5 (diff) |
sysrq,rcu: suppress RCU stall warnings while sysrq runs
Some sysrq handlers can run for a long time, because they dump a lot of
data onto a serial console. Having RCU stall warnings pop up in the
middle of them only makes the problem worse.
This patch temporarily disables RCU stall warnings while a sysrq request
is handled.
Signed-off-by: Rik van Riel <riel@redhat.com>
Suggested-by: Paul McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Madper Xie <cxie@redhat.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/tty/sysrq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 7430e87d7352..454b65898e2c 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <linux/jiffies.h> | 46 | #include <linux/jiffies.h> |
47 | #include <linux/syscalls.h> | 47 | #include <linux/syscalls.h> |
48 | #include <linux/of.h> | 48 | #include <linux/of.h> |
49 | #include <linux/rcupdate.h> | ||
49 | 50 | ||
50 | #include <asm/ptrace.h> | 51 | #include <asm/ptrace.h> |
51 | #include <asm/irq_regs.h> | 52 | #include <asm/irq_regs.h> |
@@ -511,6 +512,7 @@ void __handle_sysrq(int key, bool check_mask) | |||
511 | int orig_log_level; | 512 | int orig_log_level; |
512 | int i; | 513 | int i; |
513 | 514 | ||
515 | rcu_sysrq_start(); | ||
514 | rcu_read_lock(); | 516 | rcu_read_lock(); |
515 | /* | 517 | /* |
516 | * Raise the apparent loglevel to maximum so that the sysrq header | 518 | * Raise the apparent loglevel to maximum so that the sysrq header |
@@ -554,6 +556,7 @@ void __handle_sysrq(int key, bool check_mask) | |||
554 | console_loglevel = orig_log_level; | 556 | console_loglevel = orig_log_level; |
555 | } | 557 | } |
556 | rcu_read_unlock(); | 558 | rcu_read_unlock(); |
559 | rcu_sysrq_end(); | ||
557 | } | 560 | } |
558 | 561 | ||
559 | void handle_sysrq(int key) | 562 | void handle_sysrq(int key) |