x86/earlyprintk: setup earlyprintk as early as possible
PATCH 1/1 x86/earlyprintk: setup earlyprintk as early as possible
As setup_earlyprintk passed to the early_param, it will be usable only after 'parse_early_param' function will be called from the 'setup_arch'. So we have earlyprintk during early boot and decompression. Next point after decompression of the kernel where we can use early_printk is after call of the 'parse_early_param'.
This patch removes 'earlyprintk' from the early_param and setup it right after boot data copying. So 'early_printk' function will be usabable after decompression of kernel and before parse_early_param will be called.
--- arch/x86/kernel/early_printk.c | 4 +--- arch/x86/kernel/head64.c | 1 + include/linux/printk.h | 1 + 3 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/early_printk.c +1 -3
@@ -329,7 +329,7 @@ static inline void early_console_register(struct console *con, int keep_early)register_console (early_console); } -static int __init setup_early_printk (char *buf) +int __init setup_early_printk (char *buf) {int keep;
@@ -390,5 +390,3 @@ static int __init setup_early_printk(char *buf) }return 0 ; } - -early_param ("earlyprintk" , setup_early_printk);
arch/x86/kernel/head64.c +1 -0
@@ -171,6 +171,7 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)load_idt ((const struct desc_ptr *)&idt_descr);copy_bootdata (__va (real_mode_data)); +setup_early_printk (boot_command_line);/* * Load microcode early on BSP.
include/linux/printk.h +1 -0
@@ -115,6 +115,7 @@ int no_printk(const char *fmt, ...)#ifdef CONFIG_EARLY_PRINTK extern asmlinkage __printf(1, 2)void early_printk (const char *fmt, ...); +int setup_early_printk (char *buf); #else static inline __printf(1, 2) __cold void early_printk(const char *s, ...) { }
Signature · 1 line
2.3.3.611.g09038fc.dirty
Quoted 53 lines · Alexander Kuleshov
As
setup_earlyprintkpassed to theearly_param, it will be usable only after 'parse_early_param' function will be called from the 'setup_arch'. So we have earlyprintk during early boot and decompression. Next point after decompression of the kernel where we can useearly_printkis after call of the 'parse_early_param'.This patch removes 'earlyprintk' from the
early_paramand setup it right after boot data copying. So 'early_printk' function will be usabable after decompression of kernel and beforeparse_early_paramwill be called.Signed-off-by Alexander Kuleshov <[email protected]>--- arch/x86/kernel/early_printk.c | 4 +--- arch/x86/kernel/head64.c | 1 + include/linux/printk.h | 1 + 3 files changed, 3 insertions(+), 3 deletions(-)arch/x86/kernel/early_printk.c +1
-3@@ -329,7 +329,7 @@ static inline void early_console_register(struct console *con, int keep_early)register_console (early_console); } -static int __init setup_early_printk (char *buf) +int __init setup_early_printk (char *buf) {int keep;@@ -390,5 +390,3 @@ static int __init setup_early_printk(char *buf) }return 0 ; } - -early_param ("earlyprintk" , setup_early_printk);arch/x86/kernel/head64.c +1
-0@@ -171,6 +171,7 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)load_idt ((const struct desc_ptr *)&idt_descr);copy_bootdata (__va (real_mode_data)); +setup_early_printk (boot_command_line);/* * Load microcode early on BSP. include/linux/printk.h +0
-0
include/linux/printk.h int no_printk(const char *fmt, ...) · line 121
Quoted 7 lines
include/linux/printk.h +1
-0@@ -115,6 +115,7 @@ int no_printk(const char *fmt, ...)#ifdef CONFIG_EARLY_PRINTK extern asmlinkage __printf(1, 2)void early_printk (const char *fmt, ...); +int setup_early_printk (char *buf); #else static inline __printf(1, 2) __cold void early_printk(const char *s, ...) { }
This looks useful.
It would be nice to test it via a well placed printk() and check that before the patch the message doesn't go to the serial console and after the patch the message indeed arrives on the early serial console
- or something like that.
Thanks,
Ingo
2015-04-07 15:52 GMT+06:00 Ingo Molnar <[email protected]>:
Quoted 5 lines
It would be nice to test it via a well placed
printk()and check that before the patch the message doesn't go to the serial console and after the patch the message indeed arrives on the early serial console
- or something like that.
I have tested this patch when i wrote it and early_printk does not print anything before the parse_early_param. But i don't know how to show this in code in a correct way. Maybe we should to give back early_printk call which i removed in the previous patch
(https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=91d8f0416f3989e248d3a3d3efb821eda10a85d2)?
Any one another question about this. I submited patch only for head64.c and it does not affect kernel for i386, because i'm not sure where is the best place to setup earlyprintk in the head32.c. I thought to put it in the start of i386_start_kernel(void) (from head32.c) but not sure about it.
Quoted 10 lines · Alexander Kuleshov
2015-04-07 15:52 GMT+06:00 Ingo Molnar <[email protected]>:
Quoted 5 lines
It would be nice to test it via a well placed
printk()and check that before the patch the message doesn't go to the serial console and after the patch the message indeed arrives on the early serial console
- or something like that.I have tested this patch when i wrote it and
early_printkdoes not print anything before theparse_early_param. But i don't know how to show this in code in a correct way. [...]
Just add a debug printk() for your own testing, right after the param initialization call, to be confident that the early console indeed works.
Quoted 8 lines
which i removed in the previous patch
(https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=91d8f0416f3989e248d3a3d3efb821eda10a85d2)?Any one another question about this. I submited patch only for
head64.cand it does not affect kernel for i386, because i'm not sure where is the best place to setup earlyprintk in thehead32.c. I thought to put it in the start ofi386_start_kernel(void)(fromhead32.c) but not sure about it.
I'd use i386_start_kernel() on 32-bit and x86_64_start_kernel() on 64-bit - but I haven't tested whether it actually works.
Thanks,
Ingo
Quoted 6 lines
Ingo Molnar <[email protected]>: wrote:
Just add a debug
printk()for your own testing, right after the param initialization call, to be confident that the early console indeed works.
I already tested it as you said when was writing this patch and it works.
Quoted 4 lines
I'd use
i386_start_kernel()on 32-bit andx86_64_start_kernel()on 64-bit - but I haven't tested whether it actually works.
As i already wrote, i tested it for x86_64 and it works. I will put earlyprintk setup in the start of the i386_start_kernel, will test it with 32-bit and resend two
patches if they will be good.
Quoted 8 lines · Alexander Kuleshov
Quoted 6 lines
Ingo Molnar <[email protected]>: wrote:
Just add a debug
printk()for your own testing, right after the param initialization call, to be confident that the early console indeed works.I already tested it as you said when was writing this patch and it works.
The changelog does not tell us this and it should.
Thanks,
Ingo
Quoted 5 lines · Alexander Kuleshov
As i already wrote, i tested it for
x86_64and it works. I will put earlyprintk setup in the start of thei386_start_kernel, will test it with 32-bit and resend two
patches if they will be good.
No, that is not enough.early_printk would handle not only serial console with io port accessing. You need to make sure all other path including pciserial/dbgp/efi is safe. They are using early_ioremap, and you can not call early_ioremap() before early_ioremap.
otherwise you may need to just search "serial string in boot command line" like i did in moving earlycon early patch.
Yinghai
Subject: [PATCH -v5] x86: Setup early console as early as possible in x86_start_kernel()
Analyze "console=uart8250,io,0x3f8,115200n8" in i386_start_kernel/x86_64_start_kernel, and call setup_early_serial8250_console() to init early serial console.
Only can handle io port kind of 8250, because mmio need ioremap.
Use boot_params.hdr.version instead of adding another variable, Suggested by hpa. Also need to apply this one after x86 memblock patchset.
-v5: fix check when console string is last one in command line.
should use strchrnul(,' ') instead strchr(,' ') for end searching.
--- arch/x86/include/asm/setup.h | 2 ++ arch/x86/kernel/head.c | 26 ++++++++++++++++++++++++++ arch/x86/kernel/head32.c | 1 + arch/x86/kernel/head64.c | 5 ++++- kernel/printk/printk.c | 11 +++++++---- 5 files changed, 40 insertions(+), 5 deletions(-)
arch/x86/include/asm/setup.h +2 -0
@@ -40,6 +40,8 @@ static inline void vsmp_init(void) { }void setup_bios_corruption_check (void );extern unsigned long saved_video_mode; +int setup_early_serial8250_console (char *cmdline); +void setup_early_console (void );extern void reserve_standard_io_resources (void );extern void i386_reserve_resources (void );
arch/x86/kernel/head.c +26 -0
@@ -69,3 +69,29 @@ void __init reserve_ebda_region(void)/* reserve all memory between lowmem and the 1MB mark */ memblock_reserve (lowmem,0x100000 - lowmem); } + +void __init setup_early_console (void ) +{ +#ifdef CONFIG_SERIAL_8250_CONSOLE +char constr[64 ], *p, *q; + +/* Can not handle mmio type 8250 uart yet, too early */ + p =strstr (boot_command_line,"console=uart8250,io," ); +if (!p) + p =strstr (boot_command_line,"console=uart,io," ); +if (!p) +return ; + + p +=8 ;/* sizeof "console=" */ + q =strchrnul (p,' ' ); +if ((q - p) >=sizeof (constr)) +return ; + +memset (constr,0 ,sizeof (constr)); +memcpy (constr, p, q - p); + +lockdep_init (); + +setup_early_serial8250_console (constr); +#endif +}
arch/x86/kernel/head32.c +1 -0
@@ -33,6 +33,7 @@ asmlinkage __visible void __init i386_st {cr4_init_shadow ();sanitize_boot_params (&boot_params); +setup_early_console ();/* Call the subarch specific early setup function */ switch (boot_params.hdr.hardware_subarch) {
arch/x86/kernel/head64.c +4 -1
@@ -171,6 +171,7 @@ asmlinkage __visible void __init x86_64_load_idt ((const struct desc_ptr *)&idt_descr);copy_bootdata (__va (real_mode_data)); +setup_early_console ();/* * Load microcode early on BSP.
@@ -192,8 +193,10 @@ asmlinkage __visible void __init x86_64_void __init x86_64_start_reservations (char *real_mode_data) {/* version is always not zero if it is copied */ -if (!boot_params.hdr.version) +if (!boot_params.hdr.version) {copy_bootdata (__va (real_mode_data)); +setup_early_console (); + }reserve_ebda_region ();
kernel/printk/printk.c +7 -4
@@ -2409,11 +2409,14 @@ void register_console(struct console *nestruct console_cmdline *c;if (console_drivers) -for_each_console (bcon) -if (WARN (bcon == newcon, -"console '%s%d' already registered\n" , - bcon->name, bcon->index)) +for_each_console (bcon) { +/* not again */ +if (bcon == newcon) { +printk (KERN_INFO "console '%s%d' already registered\n" , + bcon->name, bcon->index);return ; + } + }/* * before we register a new CON_BOOT console, make sure we don't
Quoted 9 lines · Yinghai Lu
Quoted 5 lines · Alexander Kuleshov
As i already wrote, i tested it for
x86_64and it works. I will put earlyprintk setup in the start of thei386_start_kernel, will test it with 32-bit and resend two
patches if they will be good.
Quoted 5 lines
No, that is not enough.
early_printkwould handle not only serial console with io port accessing. You need to make sure all other path including pciserial/dbgp/efi is safe. They are usingearly_ioremap, and you can not callearly_ioremap()beforeearly_ioremap.
They are using early_ioremap, and you can not call early_ioremap() before early_ioremap_init.
Quoted 5 lines
otherwise you may need to just search "serial string in boot command line" like i did in moving earlycon early patch.
Yinghai