pstore: Fix printing of duplicate boot messages to console
Subsystems (2)
PATCH 1/1 pstore: Fix printing of duplicate boot messages to console
Since commit f92b070f2dc8 ("printk: Do not miss new messages when replaying the log"), CON_PRINTBUFFER flag causes the duplicate boot messages to be printed on the console when PSTORE_CONSOLE and earlycon (boot console) is enabled. Pstore console registers to boot console when earlycon is enabled during pstore_register_console as a part of ramoops initialization in postcore_initcall and the printk core checks for CON_PRINTBUFFER flag and replays the log buffer to registered console (in this case pstore console which just registered to boot console) causing duplicate messages to be printed. Remove the CON_PRINTBUFFER flag from pstore console since pstore is not concerned with the printing of buffer to console but with writing of the buffer to the backend.
Console log with earlycon and pstore console enabled:
[ 0.008342] Console: colour dummy device 80x25 [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x51df805e] ... [ 1.244049] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x51df805e]
--- fs/pstore/platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/pstore/platform.c +1 -1
@@ -505,7 +505,7 @@ static void pstore_console_write(struct console *con, const char *s, unsigned c)static struct console pstore_console = { .name ="pstore" , .write = pstore_console_write, - .flags =CON_PRINTBUFFER |CON_ENABLED |CON_ANYTIME , + .flags =CON_ENABLED |CON_ANYTIME , .index =-1 , };
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoting Sai Prakash Ranjan (2020-01-23 08:00:31)
Quoted 23 lines
Since commit
f92b070f2dc8("printk: Do not miss new messages when replaying the log"),CON_PRINTBUFFERflag causes the duplicate boot messages to be printed on the console whenPSTORE_CONSOLEand earlycon (boot console) is enabled. Pstore console registers to boot console when earlycon is enabled duringpstore_register_consoleas a part of ramoops initialization inpostcore_initcalland the printk core checks forCON_PRINTBUFFERflag and replays the log buffer to registered console (in this case pstore console which just registered to boot console) causing duplicate messages to be printed. Remove theCON_PRINTBUFFERflag from pstore console since pstore is not concerned with the printing of buffer to console but with writing of the buffer to the backend.Console log with earlycon and pstore console enabled:
[ 0.008342] Console: colour dummy device 80x25 [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x51df805e] ... [ 1.244049] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x51df805e]
Quoted 4 lines
Fixes f92b070f2dc8 ("printk: Do not miss new messages when replaying the log")Reported-by Douglas Anderson <[email protected]>Signed-off-by Sai Prakash Ranjan <[email protected]>---
While I like the idea, it seems that this breaks console-ramoops by removing all the text that is printed in the kernel log before this console is registered. I reboot and see that /sys/fs/pstore/console-ramoops-1 starts like this now:
localhost ~ # cat /sys/fs/pstore/console-ramoops-0 [ 0.943472] printk: console [pstore-1] enabled
Maybe this console can be "special" and not require anything to be printed out to visible consoles but still get the entire log contents? Or we should just not worry about it.
Quoted 34 lines · Stephen Boyd
Quoting Sai Prakash Ranjan (2020-01-23 08:00:31)
Quoted 23 lines
Since commit
f92b070f2dc8("printk: Do not miss new messages when replaying the log"),CON_PRINTBUFFERflag causes the duplicate boot messages to be printed on the console whenPSTORE_CONSOLEand earlycon (boot console) is enabled. Pstore console registers to boot console when earlycon is enabled duringpstore_register_consoleas a part of ramoops initialization inpostcore_initcalland the printk core checks forCON_PRINTBUFFERflag and replays the log buffer to registered console (in this case pstore console which just registered to boot console) causing duplicate messages to be printed. Remove theCON_PRINTBUFFERflag from pstore console since pstore is not concerned with the printing of buffer to console but with writing of the buffer to the backend.Console log with earlycon and pstore console enabled:
[ 0.008342] Console: colour dummy device 80x25 [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x51df805e] ... [ 1.244049] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x51df805e]Quoted 4 lines
Fixes f92b070f2dc8 ("printk: Do not miss new messages when replaying the log")Reported-by Douglas Anderson <[email protected]>Signed-off-by Sai Prakash Ranjan <[email protected]>---
While I like the idea, it seems that this breaks console-ramoops by removing all the text that is printed in the kernel log before this console is registered. I reboot and see that
/sys/fs/pstore/console-ramoops-1starts like this now:
Quoted 6 lines
localhost ~ # cat /sys/fs/pstore/console-ramoops-0 [ 0.943472] printk: console [pstore-1] enabledMaybe this console can be "special" and not require anything to be printed out to visible consoles but still get the entire log contents? Or we should just not worry about it.
Thanks for testing this out Stephen, I should have tested this some more. Lets drop this patch.
-Sai
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 6 lines · Sai Prakash Ranjan
Since commit
f92b070f2dc8("printk: Do not miss new messages when replaying the log"),CON_PRINTBUFFERflag causes the duplicate boot messages to be printed on the console whenPSTORE_CONSOLEand earlycon (boot console) is enabled. Pstore console registers to boot console when earlycon is enabled duringpstore_register_consoleas a part of ramoops
Quoted 8 lines
initialization in
postcore_initcalland the printk core checks forCON_PRINTBUFFERflag and replays the log buffer to registered console (in this case pstore console which just registered to boot console) causing duplicate messages to be printed. Remove theCON_PRINTBUFFERflag from pstore console since pstore is not concerned with the printing of buffer to console but with writing of the buffer to the backend.
I agree this patch isn't the solution, but I'm trying to understand where better logic could be added. Is the issue that printk sees both earlycon and CON_PRINTBUFFER active? Can we add a new CON_* flag that means "not actually printing anything"? (Or maybe a new flag for non-printing to replace CON_PRINTBUFFER that lets pstore still work?)
-Kees
Quoted 32 lines
Console log with earlycon and pstore console enabled:
[ 0.008342] Console: colour dummy device 80x25 [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x51df805e] ... [ 1.244049] hw-breakpoint: found 6 breakpoint and 4 watchpoint registers. [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x51df805e]Fixes f92b070f2dc8 ("printk: Do not miss new messages when replaying the log")Reported-by Douglas Anderson <[email protected]>Signed-off-by Sai Prakash Ranjan <[email protected]>--- fs/pstore/platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/pstore/platform.c +1
-1@@ -505,7 +505,7 @@ static void pstore_console_write(struct console *con, const char *s, unsigned c)static struct console pstore_console = { .name ="pstore" , .write = pstore_console_write, - .flags =CON_PRINTBUFFER |CON_ENABLED |CON_ANYTIME , + .flags =CON_ENABLED |CON_ANYTIME , .index =-1 , };Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Signature · 1 line
Kees Cook
Quoting Kees Cook (2020-01-27 15:27:33)
Quoted 16 lines · Sai Prakash Ranjan
Quoted 6 lines
Since commit
f92b070f2dc8("printk: Do not miss new messages when replaying the log"),CON_PRINTBUFFERflag causes the duplicate boot messages to be printed on the console whenPSTORE_CONSOLEand earlycon (boot console) is enabled. Pstore console registers to boot console when earlycon is enabled duringpstore_register_consoleas a part of ramoopsQuoted 8 lines
initialization in
postcore_initcalland the printk core checks forCON_PRINTBUFFERflag and replays the log buffer to registered console (in this case pstore console which just registered to boot console) causing duplicate messages to be printed. Remove theCON_PRINTBUFFERflag from pstore console since pstore is not concerned with the printing of buffer to console but with writing of the buffer to the backend.
Quoted 6 lines
I agree this patch isn't the solution, but I'm trying to understand where better logic could be added. Is the issue that printk sees both earlycon and
CON_PRINTBUFFERactive? Can we add a new CON_* flag that means "not actually printing anything"? (Or maybe a new flag for non-printing to replaceCON_PRINTBUFFERthat lets pstore still work?)
This seems to be fixed by commit def97da13651 ("printk: fix exclusive_console replaying"). I think there's nothing to do.