Add blockconsole version 1.1 (try 2)
Subsystems (7)
cover Add blockconsole version 1.1 (try 2)
Blockconsole is a console driver very roughly similar to netconsole. Instead of sending messages out via UDP, they are written to a block device. Typically a USB stick is chosen, although in principle any block device will do.
In most cases blockconsole is useful where netconsole is not, i.e. single machines without network access or without an accessable netconsole capture server. When using both blockconsole and netconsole, I have found netconsole to sometimes create a mess under high message load (sysrq-t, etc.) while blockconsole does not.
Most importantly, a number of bugs were identified and fixed that would have been unexplained machine reboots without blockconsole.
More highlights:
* reasonably small and self-contained code,
* some 100+ machine years of runtime,
* nice tutorial with a 30-sec guide for the impatient.
Special thanks to Borislav Petkov for many improvements and kicking my behind to provide a proper git tree and resend patches.
A number of cleanup patches could be folded into the main patch, but I decided not to mess with git history and leave any further mistakes for the world to laugh at:git://git.kernel.org/pub/scm/linux/kernel/git/joern/bcon2.git
Joern Engel (8):
do_mounts: constify name_to_dev_t parameter
add blockconsole version 1.1
printk: add CON_ALLDATA console flag
netconsole: use CON_ALLDATA
blockconsole: use CON_ALLDATA
bcon: add a release work struct
bcon: check for hdparm in bcon_tail
bcon: remove version 1.0 support
Takashi Iwai (1):
blockconsole: Allow to pass a device file path to bcon_tail
Documentation/block/blockconsole.txt | 94 ++++ Documentation/block/blockconsole/bcon_tail | 82 +++ Documentation/block/blockconsole/mkblockconsole | 29 ++ block/partitions/Makefile | 1 + block/partitions/blockconsole.c | 22 + block/partitions/check.c | 3 + block/partitions/check.h | 3 + drivers/block/Kconfig | 6 + drivers/block/Makefile | 1 + drivers/block/blockconsole.c | 617 +++++++++++++++++++++++ drivers/net/netconsole.c | 2 +- include/linux/blockconsole.h | 7 + include/linux/console.h | 1 + include/linux/mount.h | 2 +- init/do_mounts.c | 2 +- kernel/printk.c | 5 +- 16 files changed, 872 insertions(+), 5 deletions(-) create mode 100644 Documentation/block/blockconsole.txt create mode 100755 Documentation/block/blockconsole/bcon_tail create mode 100755 Documentation/block/blockconsole/mkblockconsole create mode 100644 block/partitions/blockconsole.c create mode 100644 drivers/block/blockconsole.c create mode 100644 include/linux/blockconsole.h
Signature · 1 line
1.7.10.4
PATCH 1/9 do_mounts: constify name_to_dev_t parameter
--- include/linux/mount.h | 2 +- init/do_mounts.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/mount.h +1 -1
@@ -74,6 +74,6 @@ extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,extern void mnt_set_expiry (struct vfsmount *mnt,struct list_head *expiry_list);extern void mark_mounts_for_expiry (struct list_head *mounts); -extern dev_t name_to_dev_t (char *name); +extern dev_t name_to_dev_t (const char *name);#endif /* _LINUX_MOUNT_H */
init/do_mounts.c +1 -1
@@ -202,7 +202,7 @@ done:* bangs. */ -dev_t name_to_dev_t (char *name) +dev_t name_to_dev_t (const char *name) {char s[32 ];char *p;
Signature · 1 line
1.7.10.4
PATCH 2/9 add blockconsole version 1.1
In reply to Joern EngelConsole driver similar to netconsole, except it writes to a block device. Can be useful in a setup where netconsole, for whatever reasons, is impractical.
Changes since version 1.0:
- Header format overhaul, addressing several annoyances when actually using blockconsole for production.
- Steve Hodgson added a panic notifier.
- Added improvements and cleanups from Borislav Petkov.
--- Documentation/block/blockconsole.txt | 94 ++++ Documentation/block/blockconsole/bcon_tail | 62 +++ Documentation/block/blockconsole/mkblockconsole | 29 ++ block/partitions/Makefile | 1 + block/partitions/blockconsole.c | 22 + block/partitions/check.c | 3 + block/partitions/check.h | 3 + drivers/block/Kconfig | 6 + drivers/block/Makefile | 1 + drivers/block/blockconsole.c | 621 +++++++++++++++++++++++ include/linux/blockconsole.h | 7 + 11 files changed, 849 insertions(+) create mode 100644 Documentation/block/blockconsole.txt create mode 100755 Documentation/block/blockconsole/bcon_tail create mode 100755 Documentation/block/blockconsole/mkblockconsole create mode 100644 block/partitions/blockconsole.c create mode 100644 drivers/block/blockconsole.c create mode 100644 include/linux/blockconsole.h
Documentation/block/blockconsole.txt new file +94 -0
@@ -0,0 +1,94 @@ +started by Jörn Engel <[email protected]> 2012.03.17 + +Blocksonsole for the impatient +============================== + +1. Find an unused USB stick and prepare it for blockconsole by writing + the blockconsole signature to it: + $ ./mkblockconsole /dev/<usb_stick> + +2. USB stick is ready for use, replug it so that the kernel can start + logging to it. + +3. After you've done logging, read out the logs from it like this: + $ ./bcon_tail + + This creates a file called /var/log/bcon.<UUID> which contains the + last 16M of the logs. Open it with a sane editor like vim which + can display zeroed gaps as a single line and start staring at the + logs. + For the really impatient, use: + $ vi `./bcon_tail` + +Introduction: +============= + +This module logs kernel printk messages to block devices, e.g. usb +sticks. It allows after-the-fact debugging when the main +disk/filesystem fails and serial consoles and netconsole are +impractical. + +It can currently only be used built-in. Blockconsole hooks into the +partition scanning code and will bring up configured block devices as +soon as possible. While this doesn't allow capture of early kernel +panics, it does capture most of the boot process. + +Block device configuration: +================================== + +Blockconsole has no configuration parameter. In order to use a block +device for logging, the blockconsole header has to be written to the +device in question. Logging to partitions is not supported. + +The example program mkblockconsole can be used to generate such a +header on a device. + +Header format: +============== + +A legal header looks like this: + +Linux blockconsole version 1.1 +818cf322 +00000000 +00000000 + +It consists of a newline, the "Linux blockconsole version 1.1" string +plus three numbers on separate lines each. Numbers are all 32bit, +represented as 8-byte hex strings, with letters in lowercase. The +first number is a uuid for this particular console device. Just pick +a random number when generating the device. The second number is a +wrap counter and unlikely to ever increment. The third is a tile +counter, with a tile being one megabyte in size. + +Miscellaneous notes: +==================== + +Blockconsole will write a new header for every tile or once every +megabyte. The header starts with a newline in order to ensure the +"Linux blockconsole...' string always ends up at the beginning of a +line if you read the blockconsole in a text editor. + +The blockconsole header is constructed such that opening the log +device in a text editor, ignoring memory constraints due to large +devices, should just work and be reasonably non-confusing to readers. +However, the example program bcon_tail can be used to copy the last 16 +tiles of the log device to /var/log/bcon.<uuid>, which should be much +easier to handle. + +The wrap counter is used by blockconsole to determine where to +continue logging after a reboot. New logs will be written to the +first tile that wasn't written to by the last instance of +blockconsole. Similarly bcon_tail is doing a binary search to find +the end of the log. + +Writing to the log device is strictly circular. This should give +optimal performance and reliability on cheap devices, like usb sticks. + +Writing to block devices has to happen in sector granularity, while +kernel logging happens in byte granularity. In order not to lose +messages in important cases like kernel crashes, a timer will write +out partial sectors if no new messages appear for a while. The +unwritten part of the sector will be filled with spaces and a single +newline. In a quiet system, these empty lines can make up the bulk of +the log.
Documentation/block/blockconsole/bcon_tail new file +62 -0
62 lines not on this page · raw message
Documentation/block/blockconsole/mkblockconsole new file +29 -0
@@ -0,0 +1,29 @@ +#!/bin/bash + +# handle the case when using files for logging instead of +# real devices (with kvm, for example) +DD_OPTS="conv=notrunc" + +if [ ! $# -eq 1 ]; then + echo "Usage: $0 <dev>" + exit 1 +elif mount|fgrep -q $1; then + echo Device appears to be mounted - aborting + exit 1 +else + dd if=/dev/zero of=$1 bs=1M count=1 $DD_OPTS + # The funky formatting is actually needed! + UUID=`head -c4 /dev/urandom |hexdump -e '/4 "%08x"'` + echo > /tmp/$UUID + echo 'Linux blockconsole version 1.1' >> /tmp/$UUID + echo "$UUID" >> /tmp/$UUID + echo 00000000 >> /tmp/$UUID + echo 00000000 >> /tmp/$UUID + for i in `seq 452`; do echo -n " " >> /tmp/$UUID; done + echo >> /tmp/$UUID + + dd if=/tmp/$UUID of=$1 $DD_OPTS + rm /tmp/$UUID + sync + exit 0 +fi
block/partitions/Makefile +1 -0
@@ -18,3 +18,4 @@ obj-$(CONFIG_IBM_PARTITION) += ibm.o obj-$(CONFIG_EFI_PARTITION) += efi.o obj-$(CONFIG_KARMA_PARTITION) += karma.o obj-$(CONFIG_SYSV68_PARTITION) += sysv68.o +obj-$(CONFIG_BLOCKCONSOLE) += blockconsole.o
block/partitions/blockconsole.c new file +22 -0
@@ -0,0 +1,22 @@ +#include <linux/blockconsole.h> + +#include "check.h" + +int blockconsole_partition (struct parsed_partitions *state) +{ +Sector sect; +void *data; +int err =0 ; + + data =read_part_sector (state,0 , §); +if (!data) +return -EIO ; +if (!bcon_magic_present (data)) + goto out; + +bcon_add (state->name); + err =1 ; +out: +put_dev_sector (sect); +return err; +}
block/partitions/check.c +3 -0
@@ -41,6 +41,9 @@ static int (*check_part[])(struct parsed_partitions *) = {* Probe partition formats with tables at disk address 0 * that also have an ADFS boot block at 0xdc0. */ +#ifdef CONFIG_BLOCKCONSOLE + blockconsole_partition, +#endif #ifdef CONFIG_ACORN_PARTITION_ICS adfspart_check_ICS,#endif
block/partitions/check.h +3 -0
@@ -50,3 +50,6 @@ put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size)extern int warn_no_part; +#ifdef CONFIG_BLOCKCONSOLE +int blockconsole_partition (struct parsed_partitions *state); +#endif
drivers/block/Kconfig +6 -0
@@ -544,4 +544,10 @@ config BLK_DEV_RBD If unsure, say N. +config BLOCKCONSOLE + bool "Block device console logging support" + help + This enables logging to block devices. + See <file:Documentation/block/blockconsole.txt> for details. + endif # BLK_DEV
drivers/block/Makefile +1 -0
@@ -40,5 +40,6 @@ obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ obj-$(CONFIG_BLK_DEV_DRBD) += drbd/ obj-$(CONFIG_BLK_DEV_RBD) += rbd.o obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX) += mtip32xx/ +obj-$(CONFIG_BLOCKCONSOLE) += blockconsole.o swim_mod-y := swim.o swim_asm.o
drivers/block/blockconsole.c new file +621 -0
621 lines not on this page · raw message
include/linux/blockconsole.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef LINUX_BLOCKCONSOLE_H +#define LINUX_BLOCKCONSOLE_H + +int bcon_magic_present (const void *data); +void bcon_add (const char *name); + +#endif
Signature · 1 line
1.7.10.4
PATCH 3/9 printk: add CON_ALLDATA console flag
In reply to Joern EngelFor consoles like netconsole and blockconsole the loglevel filtering really doesn't make any sense. If a line gets printed at all, please send it down to that console, no questions asked.
For vga_con, it is a completely different matter, as the user sitting in front of his console could get spammed by messages while trying to login or similar. So ignore_loglevel doesn't work as a one-size-fits-all approach. Add a per-console flag instead so that netconsole and blockconsole can opt-in.
--- include/linux/console.h | 1 + kernel/printk.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)
include/linux/console.h +1 -0
@@ -116,6 +116,7 @@ static inline int con_debug_leave(void)#define CON_BOOT (8)#define CON_ANYTIME (16)/* Safe to call when cpu is offline */ #define CON_BRL (32)/* Used for a braille device */ +#define CON_ALLDATA (64)/* per-console ignore_loglevel */ struct console {char name[16 ];
kernel/printk.c +3 -2
@@ -1261,8 +1261,6 @@ static void call_console_drivers(int level, const char *text, size_t len)trace_console (text,0 , len, len); -if (level >= console_loglevel && !ignore_loglevel) -return ;if (!console_drivers)return ;
@@ -1276,6 +1274,9 @@ static void call_console_drivers(int level, const char *text, size_t len)if (!cpu_online (smp_processor_id ()) && !(con->flags &CON_ANYTIME ))continue ; +if (level >= console_loglevel && !ignore_loglevel && + !(con->flags &CON_ALLDATA )) +continue ; con->write (con, text, len); } }
Signature · 1 line
1.7.10.4
Re: [PATCH 3/9] printk: add CON_ALLDATA console flag
Quoted 3 lines · Joern Engel
For consoles like netconsole and blockconsole the loglevel filtering really doesn't make any sense. If a line gets printed at all, please send it down to that console, no questions asked.
Could you please explain this a bit further? Why wouldn't you want to allow the admin to filter log messages to the block or network console? This doesn't make a whole lot of sense to me, and in fact could cause problems for netconsole now that you're potentially sending a ton more traffic over the wire.
Cheers,
Jeff
Re: [PATCH 3/9] printk: add CON_ALLDATA console flag
Quoted 9 lines · Jeff Moyer
Quoted 3 lines
For consoles like netconsole and blockconsole the loglevel filtering really doesn't make any sense. If a line gets printed at all, please send it down to that console, no questions asked.
Could you please explain this a bit further? Why wouldn't you want to allow the admin to filter log messages to the block or network console? This doesn't make a whole lot of sense to me, and in fact could cause problems for netconsole now that you're potentially sending a ton more traffic over the wire.
Let's reverse the question: why would the admin ever want to filter messages to debugging consoles like netconsole or blockconsole?
When running a debugging session, you generally want to see *all* messages.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Re: [PATCH 3/9] printk: add CON_ALLDATA console flag
Quoted 11 lines · Borislav Petkov
Quoted 9 lines · Jeff Moyer
Quoted 3 lines
For consoles like netconsole and blockconsole the loglevel filtering really doesn't make any sense. If a line gets printed at all, please send it down to that console, no questions asked.
Could you please explain this a bit further? Why wouldn't you want to allow the admin to filter log messages to the block or network console? This doesn't make a whole lot of sense to me, and in fact could cause problems for netconsole now that you're potentially sending a ton more traffic over the wire.
Quoted 5 lines
Let's reverse the question: why would the admin ever want to filter messages to debugging consoles like netconsole or blockconsole?
When running a debugging session, you generally want to see *all* messages.
People don't just use this for "debugging sessions." They use it in production, and I already gave you one reason why you might not want to do this with netconsole (udp is unreliable, and I've definitely seem cases where netconsole suffered due to dropped packets; this won't make that better, especially when you multiply the extra bytes times the number of servers on the subnet).
Cheers,
Jeff
Re: [PATCH 3/9] printk: add CON_ALLDATA console flag
Quoted 6 lines · Jeff Moyer
People don't just use this for "debugging sessions." They use it in production, and I already gave you one reason why you might not want to do this with netconsole (udp is unreliable, and I've definitely seem cases where netconsole suffered due to dropped packets; this won't make that better, especially when you multiply the extra bytes times the number of servers on the subnet).
Ok, so we probably need to drop 4/9 for netconsole.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Re: [PATCH 3/9] printk: add CON_ALLDATA console flag
Quoted 9 lines · Borislav Petkov
Quoted 6 lines · Jeff Moyer
People don't just use this for "debugging sessions." They use it in production, and I already gave you one reason why you might not want to do this with netconsole (udp is unreliable, and I've definitely seem cases where netconsole suffered due to dropped packets; this won't make that better, especially when you multiply the extra bytes times the number of servers on the subnet).
Ok, so we probably need to drop 4/9 for netconsole.
I don't think you've provided a very strong case for ignoring the administrator's configuration settings. I'm against the patches that introduce this behaviour, for whatever that's worth (2 cents is the going rate, I think).
Cheers,
Jeff
Re: [PATCH 3/9] printk: add CON_ALLDATA console flag
Quoted 1 line · Jeff Moyer
I don't think you've provided a very strong case for ignoring the
Maybe you should've looked at the 5/9 commit message - there's your strong case.
Quoted 3 lines
administrator's configuration settings. I'm against the patches that introduce this behaviour, for whatever that's worth (2 cents is the going rate, I think).
I'm fine with netconsole retaining old behavior since people reportedly use it not only as a debugging console.
blockconsole, OTOH, is purely a debugging console and has to log *everything* *out-of-the-box* once the block device is plugged in. No configuration, no user intervention, no admin fiddling with whatever.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Re: [PATCH 3/9] printk: add CON_ALLDATA console flag
In reply to Jeff MoyerQuoted 7 lines · Jeff Moyer
People don't just use this for "debugging sessions." They use it in production, and I already gave you one reason why you might not want to do this with netconsole (udp is unreliable, and I've definitely seem cases where netconsole suffered due to dropped packets; this won't make that better, especially when you multiply the extra bytes times the number of servers on the subnet).
I think I maintain a fairly sizeable production setup with netconsole. A few hundred machines run netconsole and send all messages to a single recipient. And all those machines have the patch we are discussing applied. That has caused roughly zero problems so far.
We constantly see problems with netconsole and presumably packet loss (haven't checked yet) when show_state() runs. That amount of load appears to be too much for the network. Regular production netconsole is utterly unimpressed in my network, with or without CON_ALLDATA.
Which is not to say you are wrong. It just means that noone has shown an example supporting your argument yet, while I have one supporting mine.
More fundamentally, I believe the console log levels used to make sense when systems had exactly one console. With multiple consoles and vastly different properties of those consoles, you simply cannot find one good answer for all. A 9600 baud serial console will usually add several seconds to your boot process, so eliminating extra messages is hugely important. Blockconsole can take several megabytes a second without blinking, so the cost of extra messages is near-zero, while the benefit remains identical.
Maybe the correct solution would be to have a separate loglevel for each console. I don't know. For my purposes the coarser CON_ALLDATA approach is good enough.
Jörn
--
"Security vulnerabilities are here to stay."
-- Scott Culp, Manager of the Microsoft Security Response Center, 2001
PATCH 4/9 netconsole: use CON_ALLDATA
In reply to Joern EngelNetconsole should really see every message ever printed. The alternative is to try debugging with information like this:
[166135.633974] Stack: [166135.634016] Call Trace: [166135.634029] <IRQ> [166135.634156] <EOI> [166135.634177] Code: 00 00 55 48 89 e5 0f 1f 44 00 00 ff 15 31 49 80 00 c9 c3 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 55 48 89 e5 0f 1f 44 00 00 [166135.634384] 48 8b 14 25 98 24 01 00 48 8d 14 92 48 8d 04 bd 00 00 00 00
--- drivers/net/netconsole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/netconsole.c +1 -1
@@ -718,7 +718,7 @@ static void write_msg(struct console *con, const char *msg, unsigned int len)static struct console netconsole = { .name ="netcon" , - .flags =CON_ENABLED , + .flags =CON_ENABLED |CON_ALLDATA , .write = write_msg, };
Signature · 1 line
1.7.10.4
PATCH 5/9 blockconsole: use CON_ALLDATA
In reply to Joern EngelBlockconsole should really see every message ever printed. The alternative is to try debugging with information like this:
[166135.633974] Stack: [166135.634016] Call Trace: [166135.634029] <IRQ> [166135.634156] <EOI> [166135.634177] Code: 00 00 55 48 89 e5 0f 1f 44 00 00 ff 15 31 49 80 00 c9 c3 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 55 48 89 e5 0f 1f 44 00 00 [166135.634384] 48 8b 14 25 98 24 01 00 48 8d 14 92 48 8d 04 bd 00 00 00 00
--- drivers/block/blockconsole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/blockconsole.c +1 -1
@@ -481,7 +481,7 @@ static int bcon_create(const char *devname)strlcpy (bc->devname, devname,sizeof (bc->devname));spin_lock_init (&bc->end_io_lock);strcpy (bc->console.name,"bcon" ); - bc->console.flags =CON_PRINTBUFFER |CON_ENABLED ; + bc->console.flags =CON_PRINTBUFFER |CON_ENABLED |CON_ALLDATA ; bc->console.write = bcon_write; bc->bdev =blkdev_get_by_path (devname, mode,NULL );#ifndef MODULE
Signature · 1 line
1.7.10.4
Re: [PATCH 5/9] blockconsole: use CON_ALLDATA
Quoted 8 lines · Joern Engel
Blockconsole should really see every message ever printed. The alternative is to try debugging with information like this:
[166135.633974] Stack: [166135.634016] Call Trace: [166135.634029] <IRQ> [166135.634156] <EOI> [166135.634177] Code: 00 00 55 48 89 e5 0f 1f 44 00 00 ff 15 31 49 80 00 c9 c3 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 55 48 89 e5 0f 1f 44 00 00 [166135.634384] 48 8b 14 25 98 24 01 00 48 8d 14 92 48 8d 04 bd 00 00 00 00
What was your log level set to at the time? By default, all of the information for a kernel panic should show up on the console, no?
Cheers,
Jeff
Re: [PATCH 5/9] blockconsole: use CON_ALLDATA
Quoted 11 lines · Jeff Moyer
Quoted 8 lines · Joern Engel
Blockconsole should really see every message ever printed. The alternative is to try debugging with information like this:
[166135.633974] Stack: [166135.634016] Call Trace: [166135.634029] <IRQ> [166135.634156] <EOI> [166135.634177] Code: 00 00 55 48 89 e5 0f 1f 44 00 00 ff 15 31 49 80 00 c9 c3 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 55 48 89 e5 0f 1f 44 00 00 [166135.634384] 48 8b 14 25 98 24 01 00 48 8d 14 92 48 8d 04 bd 00 00 00 00
Quoted 2 lines
What was your log level set to at the time? By default, all of the information for a kernel panic should show up on the console, no?
I believe it was the distro default, which should be 4. We used to play silly games with setting the loglevel to "just send everything". But that applies equally to all consoles, so you could no longer type on the console and retain your sanity at the same time.
If you and/or other people are strongly opposed to the CON_ALLDATA patches, I can either keep them private (we will never drop them from our kernel) or add a config option.
Jörn
--
Doubt is not a pleasant condition, but certainty is an absurd one. -- Voltaire
Re: [PATCH 5/9] blockconsole: use CON_ALLDATA
Quoted 3 lines · Jörn Engel
If you and/or other people are strongly opposed to the
CON_ALLDATApatches, I can either keep them private (we will never drop them from our kernel) or add a config option.
We'll do that when someone comes up with a really persuasive reason why blockconsole shouldn't log *all* messages. And, whatever we do, I don't want to configure/set anything so that blockconsole logs everything - it should be the default.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Re: [PATCH 5/9] blockconsole: use CON_ALLDATA
Quoted 9 lines · Borislav Petkov
Quoted 3 lines · Jörn Engel
If you and/or other people are strongly opposed to the
CON_ALLDATApatches, I can either keep them private (we will never drop them from our kernel) or add a config option.We'll do that when someone comes up with a really persuasive reason why blockconsole shouldn't log *all* messages. And, whatever we do, I don't want to configure/set anything so that blockconsole logs everything - it should be the default.
For blockconsole I agree. Netconsole is the interesting one, because CON_ALLDATA could be considered a regression for it.
Jörn
--
The key to performance is elegance, not battalions of special cases. -- Jon Bentley and Doug McIlroy
Re: [PATCH 5/9] blockconsole: use CON_ALLDATA
Quoted 2 lines · Jörn Engel
For blockconsole I agree. Netconsole is the interesting one, because
CON_ALLDATAcould be considered a regression for it.
Yeah, that's why I suggested dropping 4/9 - nothing changes for netconsole so that everyone can relax :-).
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--PATCH 6/9 bcon: add a release work struct
In reply to Joern EngelThe final bcon_put() can be called from atomic context, by way of bio_endio(). In that case we would sleep in invalidate_mapping_pages(), with the usual unhappy results.
In nearly a year of production use, I have only seen a matching backtrace once. There was a second known issue that could be reproduced by "yes h > /proc/sysrq-trigger" and concurrently pulling and replugging the blockconsole device. It took be somewhere around 30 pulls and sore thumbs to reproduce and I never found the time to get to the bottom of it. Quite likely the two issues are identical.
--- drivers/block/blockconsole.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/block/blockconsole.c +13 -2
@@ -65,6 +65,7 @@ struct blockconsole {struct block_device *bdev;struct console console;struct work_struct unregister_work; +struct work_struct release_work;struct task_struct *writeback_thread;struct notifier_block panic_block; };
@@ -74,9 +75,10 @@ static void bcon_get(struct blockconsole *bc)kref_get (&bc->kref); } -static void bcon_release (struct kref *kref) +static void __bcon_release (struct work_struct *work) { - struct blockconsole *bc = container_of(kref, struct blockconsole, kref); + struct blockconsole *bc = container_of(work, struct blockconsole, + release_work);__free_pages (bc->zero_page,0 );__free_pages (bc->pages,8 );
@@ -85,6 +87,14 @@ static void bcon_release(struct kref *kref)kfree (bc); } +static void bcon_release (struct kref *kref) +{ + struct blockconsole *bc = container_of(kref, struct blockconsole, kref); + +/* bcon_release can be called from atomic context */ +schedule_work (&bc->release_work); +} +static void bcon_put (struct blockconsole *bc) {kref_put (&bc->kref, bcon_release);
@@ -512,6 +522,7 @@ static int bcon_create(const char *devname)if (IS_ERR (bc->writeback_thread)) goto out2;INIT_WORK (&bc->unregister_work, bcon_unregister); +INIT_WORK (&bc->release_work, __bcon_release);register_console (&bc->console); bc->panic_block.notifier_call = blockconsole_panic; bc->panic_block.priority =INT_MAX ;
Signature · 1 line
1.7.10.4
PATCH 7/9 bcon: check for hdparm in bcon_tail
In reply to Joern EngelFrom: Borislav Petkov <[email protected]>
--- Documentation/block/blockconsole/bcon_tail | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/block/blockconsole/bcon_tail +5 -0
@@ -14,6 +14,11 @@ if [ -z "$(which lsscsi)" ]; then exit 1 fi +if [ -z "$(which hdparm)" ]; then + echo "You need to install the hdparm package on your distro." + exit 1 +fi + end_of_log() { DEV=$1 UUID=`head -c40 $DEV|tail -c8`
Signature · 1 line
1.7.10.4
PATCH 8/9 blockconsole: Allow to pass a device file path to bcon_tail
In reply to Joern EngelFrom: Takashi Iwai <[email protected]>
... instead of always looking through all devices.
Minor tweak: Moved the "CANDIDATES=" line below Takashi's new code.
--- Documentation/block/blockconsole/bcon_tail | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Documentation/block/blockconsole/bcon_tail +15 -0
@@ -58,6 +58,21 @@ end_of_log() { # HEADER contains a newline, so the funny quoting is necessary HEADER=' Linux blockconsole version 1.1' + +DEV="$1" +if [ -n "$DEV" ]; then + if [ ! -b "$DEV" ]; then + echo "bcon_tail: No block device file $DEV" + exit 1 + fi + if [ "`head -c32 $DEV`" != "$HEADER" ]; then + echo "bcon_tail: Invalid device file $DEV" + exit 1 + fi + end_of_log $DEV + exit 0 +fi + CANDIDATES=`lsscsi |sed 's|.*/dev|/dev|'` for DEV in $CANDIDATES; do
Signature · 1 line
1.7.10.4
PATCH 9/9 bcon: remove version 1.0 support
In reply to Joern EngelVery few machines ever ran with 1.0 format and by now I doubt whether a single one still does. No need to carry that code along.
--- drivers/block/blockconsole.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
drivers/block/blockconsole.c +2 -17
@@ -18,7 +18,6 @@#include <linux/sched.h> #include <linux/ctype.h> -#define BLOCKCONSOLE_MAGIC_OLD "\nLinux blockconsole version 1.0\n"#define BLOCKCONSOLE_MAGIC "\nLinux blockconsole version 1.1\n"#define BCON_UUID_OFS (32)#define BCON_ROUND_OFS (41)
@@ -234,18 +233,6 @@ static void bcon_advance_write_bytes(struct blockconsole *bc, int bytes) } } -static int bcon_convert_old_format (struct blockconsole *bc) -{ - bc->uuid =get_random_int (); - bc->round =0 ; - bc->console_bytes = bc->write_bytes =0 ; -bcon_advance_console_bytes (bc,0 );/* To skip the header */ -bcon_advance_write_bytes (bc,0 );/* To wrap around, if necessary */ -bcon_erase_segment (bc); -pr_info ("converted %s from old format\n" , bc->devname); -return 0 ; -} -static int bcon_find_end_of_log (struct blockconsole *bc) {u64 start =0 , end = bc->max_bytes, middle;
@@ -258,8 +245,8 @@ static int bcon_find_end_of_log(struct blockconsole *bc)return err;/* Second sanity check, out of sheer paranoia */ version =bcon_magic_present (sec0); -if (version ==10 ) -return bcon_convert_old_format (bc); +if (!version) +return -EINVAL ; bc->uuid =simple_strtoull (sec0 +BCON_UUID_OFS ,NULL ,16 ); bc->round =simple_strtoull (sec0 +BCON_ROUND_OFS ,NULL ,16 );
@@ -618,8 +605,6 @@ int bcon_magic_present(const void *data) {size_t len =strlen (BLOCKCONSOLE_MAGIC ); -if (!memcmp (data,BLOCKCONSOLE_MAGIC_OLD , len)) -return 10 ;if (memcmp (data,BLOCKCONSOLE_MAGIC , len))return 0 ;if (!is_four_byte_hex (data +BCON_UUID_OFS ))
Signature · 1 line
1.7.10.4
At Thu, 28 Feb 2013 16:39:53 -0500,
Quoted 20 lines · Joern Engel
Blockconsole is a console driver very roughly similar to netconsole. Instead of sending messages out via UDP, they are written to a block device. Typically a USB stick is chosen, although in principle any block device will do.
In most cases blockconsole is useful where netconsole is not, i.e. single machines without network access or without an accessable netconsole capture server. When using both blockconsole and netconsole, I have found netconsole to sometimes create a mess under high message load (sysrq-t, etc.) while blockconsole does not.
Most importantly, a number of bugs were identified and fixed that would have been unexplained machine reboots without blockconsole.
More highlights:
* reasonably small and self-contained code,
* some 100+ machine years of runtime,
* nice tutorial with a 30-sec guide for the impatient.
Quoted 7 lines
Special thanks to Borislav Petkov for many improvements and kicking my behind to provide a proper git tree and resend patches.
A number of cleanup patches could be folded into the main patch, but I decided not to mess with git history and leave any further mistakes for the world to laugh at:
git://git.kernel.org/pub/scm/linux/kernel/git/joern/bcon2.git
I got a build error after pulling onto the latest Linus tree. Also I have another couple of trivial fixes. The patches will follow.
thanks,
Takashi
PATCH 1/3 blockconsole: Fix undefined MAX_RT_PRIO
--- drivers/block/blockconsole.c | 1 + 1 file changed, 1 insertion(+)
drivers/block/blockconsole.c +1 -0
@@ -16,6 +16,7 @@#include <linux/string.h> #include <linux/workqueue.h> #include <linux/sched.h> +#include <linux/sched/rt.h> #include <linux/ctype.h> #define BLOCKCONSOLE_MAGIC "\nLinux blockconsole version 1.1\n"
Signature · 1 line
1.8.1.4
PATCH 2/3 blockconsole: Rename device_lock with bc_device_lock
Avoid the name conflict with device_lock() defined in linux/device.h.
--- drivers/block/blockconsole.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/block/blockconsole.c +5 -5
@@ -546,17 +546,17 @@ static void bcon_create_fuzzy(const char *name) } } -static DEFINE_SPINLOCK (device_lock); +static DEFINE_SPINLOCK (bc_device_lock);static char scanned_devices[80 ];static void bcon_do_add (struct work_struct *work) {char local_devices[80 ], *name, *remainder = local_devices; -spin_lock (&device_lock); +spin_lock (&bc_device_lock);memcpy (local_devices, scanned_devices,sizeof (local_devices));memset (scanned_devices,0 ,sizeof (scanned_devices)); -spin_unlock (&device_lock); +spin_unlock (&bc_device_lock);while (remainder && remainder[0 ]) { name =strsep (&remainder,"," );
@@ -573,11 +573,11 @@ void bcon_add(const char *name)* to go pick it up asap. Once it is picked up, the buffer is empty * again, so hopefully it will suffice for all sane users. */ -spin_lock (&device_lock); +spin_lock (&bc_device_lock);if (scanned_devices[0 ])strncat (scanned_devices,"," ,sizeof (scanned_devices));strncat (scanned_devices, name,sizeof (scanned_devices)); -spin_unlock (&device_lock); +spin_unlock (&bc_device_lock);schedule_work (&bcon_add_work); }
Signature · 1 line
1.8.1.4
PATCH 3/3 blockconsole: Mark a local work struct static
In reply to Takashi Iwai--- drivers/block/blockconsole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/blockconsole.c +1 -1
@@ -564,7 +564,7 @@ static void bcon_do_add(struct work_struct *work) } } -DECLARE_WORK (bcon_add_work, bcon_do_add); +static DECLARE_WORK(bcon_add_work, bcon_do_add);void bcon_add (const char *name) {
Signature · 1 line
1.8.1.4
Quoted 3 lines · Takashi Iwai
I got a build error after pulling onto the latest Linus tree. Also I have another couple of trivial fixes. The patches will follow.
Awesome, thanks! Please give me some time for caffeine and sunshine to take effect before merging. I want to s/bc_/bcon_/g one of the patches, otherwise they look fine.
Jörn
--
Computer system analysis is like child-rearing; you can do grievous damage, but you cannot ensure success."
-- Tom DeMarco
At Fri, 1 Mar 2013 11:22:39 -0500,
Quoted 9 lines · Jörn Engel
Quoted 3 lines · Takashi Iwai
I got a build error after pulling onto the latest Linus tree. Also I have another couple of trivial fixes. The patches will follow.
Awesome, thanks! Please give me some time for caffeine and sunshine to take effect before merging. I want to s/bc_/bcon_/g one of the patches, otherwise they look fine.
Thanks!
Another thing I noticed is that the panic handler calls bcon_write(), and it doesn't write to the device by itself. Is it really supposed to work?
Meanwhile I hacked the code to allow it being built as a module. If anyone is interested, I'll send a patch series. It's pretty hackish, so likely need more brush up, though.
Takashi
Quoted 4 lines · Takashi Iwai
Another thing I noticed is that the panic handler calls
bcon_write(), and it doesn't write to the device by itself. Is it really supposed to work?
Clearly it is supposed to work. In reality it sometimes does and sometimes does not. Patches to improve the success rate are welcome.
Quoted 3 lines
Meanwhile I hacked the code to allow it being built as a module. If anyone is interested, I'll send a patch series. It's pretty hackish, so likely need more brush up, though.
I am interested.
Jörn
--
Ninety percent of everything is crap.
-- Sturgeon's Law
At Wed, 6 Mar 2013 14:49:50 -0500,
Quoted 9 lines · Jörn Engel
Quoted 4 lines · Takashi Iwai
Another thing I noticed is that the panic handler calls
bcon_write(), and it doesn't write to the device by itself. Is it really supposed to work?Clearly it is supposed to work. In reality it sometimes does and sometimes does not. Patches to improve the success rate are welcome.
What I thought is to driver submit_bio in the panic handler itself so that no scheduling is involved, like the patch below. But I'm not sure whether it would actually work...
Quoted 6 lines
Quoted 4 lines
Meanwhile I hacked the code to allow it being built as a module. If anyone is interested, I'll send a patch series. It's pretty hackish, so likely need more brush up, though.
I am interested.
OK, I'll send a patch series. It'll be built on top of my previous patches. And I wrote it after merging to 3.9-rc1, so might be slightly fuzzy to your tree.
thanks,
Takashi
---
drivers/block/blockconsole.c +12 -7
@@ -361,6 +361,16 @@ static void bcon_writesector(struct blockconsole *bc, int index)submit_bio (WRITE , bio); } +static void bcon_do_writeback (struct blockconsole *bc) +{ +while (bcon_write_sector (bc) !=bcon_console_sector (bc)) { +bcon_writesector (bc,bcon_write_sector (bc)); +bcon_advance_write_bytes (bc,SECTOR_SIZE ); +if (bcon_write_sector (bc) ==0 ) +bcon_erase_segment (bc); + } +} +static int bcon_writeback (void *_bc) {struct blockconsole *bc = _bc;
@@ -373,12 +383,7 @@ static int bcon_writeback(void *_bc)schedule ();if (kthread_should_stop ())break ; -while (bcon_write_sector (bc) !=bcon_console_sector (bc)) { -bcon_writesector (bc,bcon_write_sector (bc)); -bcon_advance_write_bytes (bc,SECTOR_SIZE ); -if (bcon_write_sector (bc) ==0 ) -bcon_erase_segment (bc); - } +bcon_do_writeback (bc); }return 0 ; }
@@ -476,7 +481,7 @@ static int blockconsole_panic(struct notifier_block *this, unsigned long event, n =SECTOR_SIZE -bcon_console_ofs (bc);if (n !=SECTOR_SIZE )bcon_advance_console_bytes (bc, n); -bcon_writeback (bc); +bcon_do_writeback (bc);return NOTIFY_DONE ; }
cover blockconsole: make it a module
Hi,
this is a patch series to allow to build the blockconsole as a module. In a short test, it seems working somehow. The module removal code is a bit scary and there is much room for improvements / simplification.
thanks,
Takashi
PATCH 1/3 Export sched_setscheduler_nocheck()
... to be usable by modules.
--- kernel/sched/core.c | 1 + 1 file changed, 1 insertion(+)
kernel/sched/core.c +1 -0
@@ -3993,6 +3993,7 @@ int sched_setscheduler_nocheck(struct task_struct *p, int policy, {return __sched_setscheduler (p, policy, param, false); } +EXPORT_SYMBOL_GPL (sched_setscheduler_nocheck);static int do_sched_setscheduler (pid_t pid,int policy,struct sched_param __user *param)
Signature · 1 line
1.8.1.4
PATCH 2/3 block/partitions: Support dynamic addition of partition checkers
In reply to Takashi IwaiAdd helper functions to add / remove the partition checker function dynamically. This also allows to move the partition checker code into the driver itself, e.g. the blockconsole partition checker can be in a part of blockconsole driver (even as a module).
--- block/partitions/check.c | 35 +++++++++++++++++++++++++++++++++++ block/partitions/check.h | 8 ++++++++ 2 files changed, 43 insertions(+)
block/partitions/check.c +35 -0
@@ -17,6 +17,7 @@#include <linux/vmalloc.h> #include <linux/ctype.h> #include <linux/genhd.h> +#include <linux/export.h> #include "check.h"
@@ -110,6 +111,9 @@ static int (*check_part[])(struct parsed_partitions *) = { NULL }; +static DEFINE_MUTEX (check_part_mutex); +static LIST_HEAD (check_part_list); +static struct parsed_partitions *allocate_partitions (struct gendisk *hd) {struct parsed_partitions *state;
@@ -172,6 +176,21 @@ check_partition(struct gendisk *hd, struct block_device *bdev) } } + +if (res <=0 ) { +struct partition_checker *c; +mutex_lock (&check_part_mutex); +list_for_each_entry (c, &check_part_list, list) { +memset (state->parts,0 , state->limit *sizeof (state->parts[0 ])); + res = c->check (state); +if (res <0 ) { + err = res; + res =0 ; + } + } +mutex_unlock (&check_part_mutex); + } +if (res >0 ) {printk (KERN_INFO "%s" , state->pp_buf);
@@ -194,3 +213,19 @@ check_partition(struct gendisk *hd, struct block_device *bdev)free_partitions (state);return ERR_PTR (res); } + +void append_partition_checker (struct partition_checker *c) +{ +mutex_lock (&check_part_mutex); +list_add_tail (&c->list, &check_part_list); +mutex_unlock (&check_part_mutex); +} +EXPORT_SYMBOL_GPL (append_partition_checker); + +void remove_partition_checker (struct partition_checker *c) +{ +mutex_lock (&check_part_mutex); +list_del (&c->list); +mutex_unlock (&check_part_mutex); +} +EXPORT_SYMBOL_GPL (remove_partition_checker);
block/partitions/check.h +8 -0
@@ -55,3 +55,11 @@ extern int warn_no_part;#ifdef CONFIG_BLOCKCONSOLE int blockconsole_partition (struct parsed_partitions *state);#endif + +struct partition_checker { +int (*check)(struct parsed_partitions *); +struct list_head list; +}; + +void append_partition_checker (struct partition_checker *c); +void remove_partition_checker (struct partition_checker *c);
Signature · 1 line
1.8.1.4
PATCH 3/3 blockconsole: Allow to be a module
In reply to Takashi IwaiMove the partition checker code into blockconsole driver so that it can be built as a module, too. linux/blockconsole.h is removed since all stuff is found locally in drivers/block/blockconsole.c. Also some functions are marked as static for the same reason.
A new linked list is added to blockconsole instance for managing the proper unregistration at unloading the module on the fly.
--- block/partitions/Makefile | 1 - block/partitions/blockconsole.c | 22 ----------- block/partitions/check.c | 3 -- block/partitions/check.h | 4 -- drivers/block/Kconfig | 2 +- drivers/block/blockconsole.c | 84 +++++++++++++++++++++++++++++++++++++++-- include/linux/blockconsole.h | 7 ---- 7 files changed, 81 insertions(+), 42 deletions(-) delete mode 100644 block/partitions/blockconsole.c delete mode 100644 include/linux/blockconsole.h
block/partitions/Makefile +0 -1
@@ -18,4 +18,3 @@ obj-$(CONFIG_IBM_PARTITION) += ibm.o obj-$(CONFIG_EFI_PARTITION) += efi.o obj-$(CONFIG_KARMA_PARTITION) += karma.o obj-$(CONFIG_SYSV68_PARTITION) += sysv68.o -obj-$(CONFIG_BLOCKCONSOLE) += blockconsole.o
block/partitions/blockconsole.c deleted +0 -22
@@ -1,22 +0,0 @@ -#include <linux/blockconsole.h> - -#include "check.h" - -int blockconsole_partition (struct parsed_partitions *state) -{ -Sector sect; -void *data; -int err =0 ; - - data =read_part_sector (state,0 , §); -if (!data) -return -EIO ; -if (!bcon_magic_present (data)) - goto out; - -bcon_add (state->name); - err =1 ; -out: -put_dev_sector (sect); -return err; -}
block/partitions/check.c +0 -3
@@ -43,9 +43,6 @@ static int (*check_part[])(struct parsed_partitions *) = {* Probe partition formats with tables at disk address 0 * that also have an ADFS boot block at 0xdc0. */ -#ifdef CONFIG_BLOCKCONSOLE - blockconsole_partition, -#endif #ifdef CONFIG_ACORN_PARTITION_ICS adfspart_check_ICS,#endif
block/partitions/check.h +0 -4
@@ -52,10 +52,6 @@ put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size)extern int warn_no_part; -#ifdef CONFIG_BLOCKCONSOLE -int blockconsole_partition (struct parsed_partitions *state); -#endif -struct partition_checker {int (*check)(struct parsed_partitions *);struct list_head list;
drivers/block/Kconfig +1 -1
@@ -542,7 +542,7 @@ config BLK_DEV_RSXX module will be called rsxx. config BLOCKCONSOLE - bool "Block device console logging support" + tristate "Block device console logging support" help This enables logging to block devices. See <file:Documentation/block/blockconsole.txt> for details.
drivers/block/blockconsole.c +80 -4
160 lines not on this page · raw message
include/linux/blockconsole.h deleted +0 -7
@@ -1,7 +0,0 @@ -#ifndef LINUX_BLOCKCONSOLE_H -#define LINUX_BLOCKCONSOLE_H - -int bcon_magic_present (const void *data); -void bcon_add (const char *name); - -#endif
Signature · 1 line
1.8.1.4
Hi Andrew,
Quoted 11 lines · Joern Engel
Blockconsole is a console driver very roughly similar to netconsole. Instead of sending messages out via UDP, they are written to a block device. Typically a USB stick is chosen, although in principle any block device will do.
In most cases blockconsole is useful where netconsole is not, i.e. single machines without network access or without an accessable netconsole capture server. When using both blockconsole and netconsole, I have found netconsole to sometimes create a mess under high message load (sysrq-t, etc.) while blockconsole does not.
Quoted 7 lines
Most importantly, a number of bugs were identified and fixed that would have been unexplained machine reboots without blockconsole.
More highlights:
* reasonably small and self-contained code,
* some 100+ machine years of runtime,
* nice tutorial with a 30-sec guide for the impatient.
any thoughts on this?
Blockconsole is very useful in certain situations and a bunch of people are using it already and it would be nice if we could get it moving towards upstream.
So I'd appreciate it if you could take a look and maybe even pick it up if there are no serious issues with it.
Thanks a bunch.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--At Wed, 20 Mar 2013 23:52:31 +0100,
Quoted 23 lines · Borislav Petkov
Hi Andrew,
Quoted 11 lines · Joern Engel
Blockconsole is a console driver very roughly similar to netconsole. Instead of sending messages out via UDP, they are written to a block device. Typically a USB stick is chosen, although in principle any block device will do.
In most cases blockconsole is useful where netconsole is not, i.e. single machines without network access or without an accessable netconsole capture server. When using both blockconsole and netconsole, I have found netconsole to sometimes create a mess under high message load (sysrq-t, etc.) while blockconsole does not.
Quoted 7 lines
Most importantly, a number of bugs were identified and fixed that would have been unexplained machine reboots without blockconsole.
More highlights:
* reasonably small and self-contained code,
* some 100+ machine years of runtime,
* nice tutorial with a 30-sec guide for the impatient.
Quoted 8 lines
any thoughts on this?
Blockconsole is very useful in certain situations and a bunch of people are using it already and it would be nice if we could get it moving towards upstream.
So I'd appreciate it if you could take a look and maybe even pick it up if there are no serious issues with it.
FYI, blockconsole was already merged in linux-next tree.
Takashi