Add two new functions for reading the kernel log buffer. Their intention is to be used by recovery/dump/debug code so the kernel log can be easily retrieved/parsed in a crash scenario, but they are generic enough for other people to dream up other fun uses. Signed-off-by: Mike Frysinger --- diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 4300bb4..baa661c 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -156,6 +156,8 @@ asmlinkage int vprintk(const char *fmt, va_list args) __attribute__ ((format (printf, 1, 0))); asmlinkage int printk(const char * fmt, ...) __attribute__ ((format (printf, 1, 2))) __cold; +extern int log_buf_get_len(void); +extern int log_buf_read(int idx); #else static inline int vprintk(const char *s, va_list args) __attribute__ ((format (printf, 1, 0))); @@ -163,6 +165,8 @@ static inline int vprintk(const char *s, va_list args) { return 0; } static inline int printk(const char *s, ...) __attribute__ ((format (printf, 1, 2))); static inline int __cold printk(const char *s, ...) { return 0; } +static inline int log_buf_get_len(void) { return 0; } +static inline int log_buf_read(int idx); { return 0; } #endif unsigned long int_sqrt(unsigned long); diff --git a/kernel/printk.c b/kernel/printk.c index 051d27e..fae4367 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -163,6 +163,35 @@ out: __setup("log_buf_len=", log_buf_len_setup); /* + * Return the number of unread characters in the log buffer. + */ +int log_buf_get_len(void) +{ + return log_end - log_start; +} + +/* + * Extract a character from the log buffer. + */ +int log_buf_read(int idx) +{ + int ret; + + if (!oops_in_progress) + spin_lock_irq(&logbuf_lock); + + if (idx < 0 || idx >= log_buf_get_len()) + ret = -1; + else + ret = LOG_BUF(idx); + + if (!oops_in_progress) + spin_unlock_irq(&logbuf_lock); + + return ret; +} + +/* * Commands to do_syslog: * * 0 -- Close the log. Currently a NOP.