The patch titled
SysRq-X: show blocked tasks
has been added to the -mm tree. Its filename is
sysrq-x-show-blocked-tasks.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: SysRq-X: show blocked tasks
From: Ingo Molnar <mingo@xxxxxxx>
Add SysRq-X support: show blocked (TASK_UNINTERRUPTIBLE) tasks only.
Useful for debugging IO stalls.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/sysrq.c | 14 +++++++++++++-
include/linux/sched.h | 11 ++++++++++-
kernel/sched.c | 11 ++++++++---
3 files changed, 31 insertions(+), 5 deletions(-)
diff -puN drivers/char/sysrq.c~sysrq-x-show-blocked-tasks drivers/char/sysrq.c
--- a/drivers/char/sysrq.c~sysrq-x-show-blocked-tasks
+++ a/drivers/char/sysrq.c
@@ -182,6 +182,18 @@ static struct sysrq_key_op sysrq_showsta
.enable_mask = SYSRQ_ENABLE_DUMP,
};
+static void sysrq_handle_showstate_blocked(int key, struct tty_struct *tty)
+{
+ show_state_filter(TASK_UNINTERRUPTIBLE);
+}
+static struct sysrq_key_op sysrq_showstate_blocked_op = {
+ .handler = sysrq_handle_showstate_blocked,
+ .help_msg = "showBlockedTasks",
+ .action_msg = "Show Blocked State",
+ .enable_mask = SYSRQ_ENABLE_DUMP,
+};
+
+
static void sysrq_handle_showmem(int key, struct tty_struct *tty)
{
show_mem();
@@ -304,7 +316,7 @@ static struct sysrq_key_op *sysrq_key_ta
/* May be assigned at init time by SMP VOYAGER */
NULL, /* v */
NULL, /* w */
- NULL, /* x */
+ &sysrq_showstate_blocked_op, /* x */
NULL, /* y */
NULL /* z */
};
diff -puN include/linux/sched.h~sysrq-x-show-blocked-tasks include/linux/sched.h
--- a/include/linux/sched.h~sysrq-x-show-blocked-tasks
+++ a/include/linux/sched.h
@@ -194,7 +194,16 @@ extern void init_idle(struct task_struct
extern cpumask_t nohz_cpu_mask;
-extern void show_state(void);
+/*
+ * Only dump TASK_* tasks. (0 for all tasks)
+ */
+extern void show_state_filter(unsigned long state_filter);
+
+static inline void show_state(void)
+{
+ show_state_filter(0);
+}
+
extern void show_regs(struct pt_regs *);
/*
diff -puN kernel/sched.c~sysrq-x-show-blocked-tasks kernel/sched.c
--- a/kernel/sched.c~sysrq-x-show-blocked-tasks
+++ a/kernel/sched.c
@@ -4804,7 +4804,7 @@ static void show_task(struct task_struct
show_stack(p, NULL);
}
-void show_state(void)
+void show_state_filter(unsigned long state_filter)
{
struct task_struct *g, *p;
@@ -4824,11 +4824,16 @@ void show_state(void)
* console might take alot of time:
*/
touch_nmi_watchdog();
- show_task(p);
+ if (state_filter && (p->state & state_filter))
+ show_task(p);
} while_each_thread(g, p);
read_unlock(&tasklist_lock);
- debug_show_all_locks();
+ /*
+ * Only show locks if all tasks are dumped:
+ */
+ if (!state_filter)
+ debug_show_all_locks();
}
/**
_
Patches currently in -mm which might be from mingo@xxxxxxx are
lockdep-increase-max-allowed-recursion-depth.patch
i386-time-avoid-pit-smp-lockups.patch
posix-cpu-timers-prevent-signal-delivery-starvation.patch
genirq-clean-up-irq-flow-type-naming.patch
bonding-lockdep-annotation.patch
spinlock-debug-all-cpu-backtrace.patch
i386-fix-cfi_signal_frame-copy-n-paste-error.patch
lockdep-annotate-nfs-nfsd-in-kernel-sockets.patch
lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy.patch
lockdep-annotate-i386-apm.patch
rt-mutex-fixup-rt-mutex-debug-code.patch
sysrq-x-show-blocked-tasks.patch
remove-the-old-bd_mutex-lockdep-annotation.patch
new-bd_mutex-lockdep-annotation.patch
remove-lock_key-approach-to-managing-nested-bd_mutex-locks.patch
simplify-some-aspects-of-bd_mutex-nesting.patch
use-mutex_lock_nested-for-bd_mutex-to-avoid-lockdep-warning.patch
avoid-lockdep-warning-in-md.patch
sched-add-above-background-load-function.patch
mm-implement-swap-prefetching.patch
sched-cleanup-remove-task_t-convert-to-struct-task_struct-prefetch.patch
gtod-exponential-update_wall_time.patch
gtod-persistent-clock-support-core.patch
gtod-persistent-clock-support-i386.patch
time-uninline-jiffiesh.patch
time-uninline-jiffiesh-fix.patch
time-fix-msecs_to_jiffies-bug.patch
time-fix-timeout-overflow.patch
cleanup-uninline-irq_enter-and-move-it-into-a-function.patch
dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie.patch
hrtimers-namespace-and-enum-cleanup.patch
hrtimers-clean-up-locking.patch
hrtimers-state-tracking.patch
hrtimers-clean-up-callback-tracking.patch
hrtimers-move-and-add-documentation.patch
clockevents-core.patch
clockevents-drivers-for-i386.patch
high-res-timers-core.patch
gtod-mark-tsc-unusable-for-highres-timers.patch
dynticks-core.patch
dynticks-add-nohz-stats-to-proc-stat.patch
dynticks-i386-arch-code.patch
high-res-timers-dynticks-enable-i386-support.patch
debugging-feature-timer-stats.patch
round_jiffies-infrastructure.patch
round_jiffies-infrastructure-fix.patch
detect-atomic-counter-underflows.patch
debug-shared-irqs.patch
make-frame_pointer-default=y.patch
mutex-subsystem-synchro-test-module.patch
vdso-print-fatal-signals.patch
vdso-improve-print_fatal_signals-support-by-adding-memory-maps.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
