tagged console logging detour via printk
Subsystems (4)
PATCH 1/1 tagged console logging detour via printk
Hi,
This version of console detour patch provides tagging of console messages, when sent to printk. This may result in logs like this:
...
May 6 22:41:27 lap1 kernel: [ 1.092979] Freeing unused kernel memory: 548k freed May 6 22:41:27 lap1 kernel: [ 1.094503] Write protecting the kernel text: 3564k May 6 22:41:27 lap1 kernel: [ 1.094739] Write protecting the kernel read-only data: 1736k May 6 22:41:27 lap1 kernel: [C][ 1.099902] Mounting proc filesystem May 6 22:41:27 lap1 kernel: [C][ 1.100165] Mounting sysfs filesystem May 6 22:41:27 lap1 kernel: [C][ 1.100440] Creating /dev May 6 22:41:27 lap1 kernel: [C][ 1.101835] Creating initial device nodes ... ... May 6 22:41:27 lap1 kernel: [C][ 25.313917] Bringing up interface eth0: \ May 6 22:41:27 lap1 kernel: [ 25.433672] eth0: link up, 100Mbps, full-duplex, lpa 0x45E1 May 6 22:41:27 lap1 kernel: [C][ 30.863244] ESC[60G\ May 6 22:41:27 lap1 kernel: [C][ 30.863319] [\ May 6 22:41:27 lap1 kernel: [C][ 30.863443] ESC[0;32m\ May 6 22:41:27 lap1 kernel: [C][ 30.863499] OK \ May 6 22:41:27 lap1 kernel: [C][ 30.863617] ESC[0;39m\ May 6 22:41:27 lap1 kernel: [C][ 30.863663] ]\ May 6 22:41:27 lap1 kernel: [C][ 30.863710] ^ ... May 6 22:41:27 lap1 kernel: [C][ 31.327576] Starting system logger: \
...
It would have been possible for the system logger to use the console tag and replace the "kernel" with e.g. "console" word for console messages. The other thing the system logger could do is to fix its time stamps for messages generated before logger start-up based on printk time stamp (see the last message in the example log)...
regards,
Samo
p.s.
I'll provide also an independent detour tty driver as Alan suggested.
---
Signed-off-by Samo Pogacnik <[email protected]>
Documentation/kernel-parameters.txt +2 -0
@@ -628,6 +628,8 @@ and is between 256 and 4096 characters. It is defined in the file Defaults to the default architecture's huge page size if not specified. + detour [KNL] Enable console logging detour via printk. + dhash_entries= [KNL] Set number of hash buckets for dentry cache.
drivers/char/Kconfig +16 -0
@@ -88,6 +88,22 @@ config VT_HW_CONSOLE_BINDING information. For framebuffer console users, please refer to <file:Documentation/fb/fbcon.txt>. +config CONSOLE_DETOUR + bool "Support for console detour via printk" + default n + ---help--- + If you say Y here, the support for writing console messages via + printk is included into the console code. + + The feature is useful to catch all console log messages. + In order to use this feature, you should specify kernel command line + option "detour" or write a positive number into + /proc/sys/kernel/console_detour. You can disable the feature on-line + by writing zero into the proc file. By writing a negative value into + the proc file, the feature is disabled permanently (until next boot). + + If unsure, say N. + config DEVKMEM bool "/dev/kmem virtual device support" default y
drivers/char/tty_io.c +7 -0
@@ -1087,6 +1087,13 @@ ssize_t redirected_tty_write(struct file *file, const char __user *buf, }spin_unlock (&redirect_lock); +#ifdef CONFIG_CONSOLE_DETOUR +if (console_detour) { +console_printk_detour (buf, count); +if (!p) +return count; + } +#endif if (p) {ssize_t res; res =vfs_write (p, buf, count, &p->f_pos);
include/linux/console.h +7 -0
@@ -108,6 +108,13 @@ struct console {struct console *next; }; +extern int console_detour; +extern void console_printk_detour (const unsigned char *buf,int count); + +struct ctl_table ; +int detour_sysctl_handler (struct ctl_table *table,int write, +void __user *buffer,size_t *length,loff_t *ppos); +extern int console_set_on_cmdline;extern int add_preferred_console (char *name,int idx,char *options);
init/main.c +9 -0
@@ -25,6 +25,7 @@#include <linux/bootmem.h> #include <linux/acpi.h> #include <linux/tty.h> +#include <linux/console.h> #include <linux/gfp.h> #include <linux/percpu.h> #include <linux/kmod.h>
@@ -249,6 +250,14 @@ static int __init loglevel(char *str)early_param ("loglevel" , loglevel); +static int __init detour (char *str) +{ + console_detour =1 ; +return 0 ; +} + +early_param ("detour" , detour); +/* * Unknown boot options get handed to init, unless they look like * unused parameters (modprobe will find them in /proc/cmdline).
kernel/printk.c +85 -0
103 lines not on this page · raw message
kernel/sysctl.c +8 -0
@@ -50,6 +50,7 @@#include <linux/ftrace.h> #include <linux/slow-work.h> #include <linux/perf_event.h> +#include <linux/console.h> #include <asm/uaccess.h> #include <asm/processor.h>
@@ -936,6 +937,13 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, },#endif + { + .procname = "console_detour", + .data = &console_detour, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &detour_sysctl_handler, + },/* * NOTE: do not add new entries to this table unless you have read * Documentation/sysctl/ctl_unnumbered.txt