Certain calls from the kdb shell will call out to printk(), and any of
these calls should get vectored back to the kdb_printf() so that the
kdb pager and processing can be used, as well as to properly channel
I/O to the polled I/O devices.
CC: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
KDB_REASON_SSTEP, /* Single Step trap. - regs valid */
} kdb_reason_t;
KDB_REASON_SSTEP, /* Single Step trap. - regs valid */
} kdb_reason_t;
+extern int kdb_trap_printk;
+extern int vkdb_printf(const char *fmt, va_list args)
+ __attribute__ ((format (printf, 1, 0)));
extern int kdb_printf(const char *, ...)
__attribute__ ((format (printf, 1, 2)));
typedef int (*kdb_printf_t)(const char *, ...)
extern int kdb_printf(const char *, ...)
__attribute__ ((format (printf, 1, 2)));
typedef int (*kdb_printf_t)(const char *, ...)
{
int old_lvl = console_loglevel;
console_loglevel = 15;
{
int old_lvl = console_loglevel;
console_loglevel = 15;
kdb_set_current_task(p);
if (addr) {
show_stack((struct task_struct *)p, addr);
kdb_set_current_task(p);
if (addr) {
show_stack((struct task_struct *)p, addr);
show_stack(p, NULL);
}
console_loglevel = old_lvl;
show_stack(p, NULL);
}
console_loglevel = old_lvl;
#define CMD_BUFLEN 256
char kdb_prompt_str[CMD_BUFLEN];
#define CMD_BUFLEN 256
char kdb_prompt_str[CMD_BUFLEN];
static void kgdb_transition_check(char *buffer)
{
static void kgdb_transition_check(char *buffer)
{
-int kdb_printf(const char *fmt, ...)
+int vkdb_printf(const char *fmt, va_list ap)
int diag;
int linecount;
int logging, saved_loglevel = 0;
int diag;
int linecount;
int logging, saved_loglevel = 0;
int got_printf_lock = 0;
int retlen = 0;
int fnd, len;
int got_printf_lock = 0;
int retlen = 0;
int fnd, len;
unsigned long uninitialized_var(flags);
preempt_disable();
unsigned long uninitialized_var(flags);
preempt_disable();
+ saved_trap_printk = kdb_trap_printk;
+ kdb_trap_printk = 0;
+
/* Serialize kdb_printf if multiple cpus try to write at once.
* But if any cpu goes recursive in kdb, just print the output,
* even if it is interleaved with any other text.
/* Serialize kdb_printf if multiple cpus try to write at once.
* But if any cpu goes recursive in kdb, just print the output,
* even if it is interleaved with any other text.
next_avail = kdb_buffer;
size_avail = sizeof(kdb_buffer);
}
next_avail = kdb_buffer;
size_avail = sizeof(kdb_buffer);
}
vsnprintf(next_avail, size_avail, fmt, ap);
vsnprintf(next_avail, size_avail, fmt, ap);
/*
* If kdb_parse() found that the command was cmd xxx | grep yyy
/*
* If kdb_parse() found that the command was cmd xxx | grep yyy
} else {
__release(kdb_printf_lock);
}
} else {
__release(kdb_printf_lock);
}
+ kdb_trap_printk = saved_trap_printk;
preempt_enable();
return retlen;
}
preempt_enable();
return retlen;
}
+
+int kdb_printf(const char *fmt, ...)
+{
+ va_list ap;
+ int r;
+
+ va_start(ap, fmt);
+ r = vkdb_printf(fmt, ap);
+ va_end(ap);
+
+ return r;
+}
+
{
int old_lvl = console_loglevel;
console_loglevel = 15;
{
int old_lvl = console_loglevel;
console_loglevel = 15;
kdb_printf("\n");
console_loglevel = old_lvl;
}
kdb_printf("\n");
console_loglevel = old_lvl;
}
if (argc != 1)
return KDB_ARGCOUNT;
sysrq_toggle_support(1);
if (argc != 1)
return KDB_ARGCOUNT;
sysrq_toggle_support(1);
handle_sysrq(*argv[1], NULL);
handle_sysrq(*argv[1], NULL);
#include <linux/bootmem.h>
#include <linux/syscalls.h>
#include <linux/kexec.h>
#include <linux/bootmem.h>
#include <linux/syscalls.h>
#include <linux/kexec.h>
#include <linux/ratelimit.h>
#include <linux/kmsg_dump.h>
#include <linux/syslog.h>
#include <linux/ratelimit.h>
#include <linux/kmsg_dump.h>
#include <linux/syslog.h>
+#ifdef CONFIG_KGDB_KDB
+ if (unlikely(kdb_trap_printk)) {
+ va_start(args, fmt);
+ r = vkdb_printf(fmt, args);
+ va_end(args);
+ return r;
+ }
+#endif
va_start(args, fmt);
r = vprintk(fmt, args);
va_end(args);
va_start(args, fmt);
r = vprintk(fmt, args);
va_end(args);