x86/earlyprintk: setup earlyprintk as early as possible
v5 cover x86/earlyprintk: setup earlyprintk as early as possible
The early_printk function is usable after setup_early_printk will be executed. We pass 'earlyprintk' through the kernel command line. It means that earlyprintk will be usable only after the 'parse_early_param' will be executed. So we have usable earlyprintk only during early boot, kernel decompression and after call of the 'parse_early_param'. This patchset makes earlyprintk usable before the call of the 'parse_early_param'.
These patchset provides two patches:
1. Move handling of the builtin command line to the separate function from the setup_arch. Now we can call it from the arch/x86/kernel/head{32,64}.c, and find 'earlyprintk' kernel command line paramter there.
2. Provide setup_serial_console function to setup serial earlyprintk in the arch/x86/kernel/head{32,64}.c
Changes v5:
* Call setup_builtin_cmdline instead of setup_cmdline
Changes v4:
* Move setup_early_serial_console from the include/linux/printk.h to the arch/x86/include/asm/serial.h, because this function is only for x86 now.
Changes v3:
* Call setup_cmdline before setup_early_printk;
* setup_early_printk call wrapped with the setup_early_serial_console which checks that 'serial' given to the earlyprintk command line option. This prevents call of the setup_early_printk with the given pciserial/dbgp/efi, because they are using early_ioremap.
Changes v2:
* Comment added before the setup_early_printk call;
* Added information about testing to the commit message.
Alexander Kuleshov (2):
x86/setup: update boot_command_line with builtin_cmdline in separate
function
x86/earlyprintk: setup earlyprintk as early as possible
arch/x86/include/asm/serial.h | 2 ++ arch/x86/include/asm/setup.h | 3 ++- arch/x86/kernel/early_printk.c | 25 +++++++++++++++++++++++++ arch/x86/kernel/head32.c | 6 ++++++ arch/x86/kernel/head64.c | 7 +++++++ arch/x86/kernel/setup.c | 28 +++++++++++++++------------- 6 files changed, 57 insertions(+), 14 deletions(-)
Signature · 1 line
2.4.0
PATCH v2 1/2 x86/setup: introduce setup_bultin_cmdline
This patch introduces setup_builtin_cmdline function which appends/overrides boot_command_line with the builtin_cmdline if CONFIG_CMDLINE_BOOL is set. Previously this functional was in the setup_arch, but we need to move it for getting actual command line as early as possible in the arch/x86/kernel/head{32,64}.c for the earlyprintk setup.
Changes:
v2: function renamed from setup_cmdline to setup_builtin_cmdline to avoid conflict with the setup_cmdline from the arch/x86/kernel/kexec-bzimage64.c
--- arch/x86/include/asm/setup.h | 3 ++- arch/x86/kernel/head32.c | 1 + arch/x86/kernel/head64.c | 1 + arch/x86/kernel/setup.c | 28 +++++++++++++++------------- 4 files changed, 19 insertions(+), 14 deletions(-)
arch/x86/include/asm/setup.h +2 -1
@@ -24,6 +24,7 @@#define OLD_CL_ADDRESS 0x020/* Relative to real mode data */ #define NEW_CL_POINTER 0x228/* Relative to real mode data */ +#ifndef __ASSEMBLY__#include <asm/bootparam.h> #include <asm/x86_init.h>
@@ -117,8 +118,8 @@ asmlinkage void __init i386_start_kernel(void);#else asmlinkage void __init x86_64_start_kernel(char *real_mode); asmlinkage void __init x86_64_start_reservations(char *real_mode_data); -#endif /* __i386__ */ +void __init setup_builtin_cmdline (void );#endif /* _SETUP */ #else #define RESERVE_BRK (name,sz) \
arch/x86/kernel/head32.c +1 -0
@@ -31,6 +31,7 @@ static void __init i386_default_early_setup(void) asmlinkage __visible void __init i386_start_kernel(void) { +setup_builtin_cmdline ();cr4_init_shadow ();sanitize_boot_params (&boot_params);
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_builtin_cmdline ();/* * Load microcode early on BSP.
arch/x86/kernel/setup.c +15 -13
@@ -845,6 +845,21 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)return 0 ; } +void __init setup_builtin_cmdline (void ) { +#ifdef CONFIG_CMDLINE_BOOL +#ifdef CONFIG_CMDLINE_OVERRIDE +strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); +#else +if (builtin_cmdline[0 ]) { +/* append boot loader cmdline to builtin */ +strlcat (builtin_cmdline," " ,COMMAND_LINE_SIZE ); +strlcat (builtin_cmdline, boot_command_line,COMMAND_LINE_SIZE ); +strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); + } +#endif +#endif +} +/* * Determine if we were loaded by an EFI loader. If so, then we have also been * passed the efi memmap, systab, etc., so we should use these data structures
@@ -973,19 +988,6 @@ void __init setup_arch(char **cmdline_p) bss_resource.start =__pa_symbol (__bss_start); bss_resource.end =__pa_symbol (__bss_stop)-1 ; -#ifdef CONFIG_CMDLINE_BOOL -#ifdef CONFIG_CMDLINE_OVERRIDE -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); -#else -if (builtin_cmdline[0 ]) { -/* append boot loader cmdline to builtin */ -strlcat (builtin_cmdline," " ,COMMAND_LINE_SIZE ); -strlcat (builtin_cmdline, boot_command_line,COMMAND_LINE_SIZE ); -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); - } -#endif -#endif -strlcpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = command_line;
Signature · 1 line
2.4.0
Re: [PATCH v2 1/2] x86/setup: introduce setup_bultin_cmdline
Quoted 11 lines · Alexander Kuleshov
This patch introduces
setup_builtin_cmdlinefunction which appends/overridesboot_command_linewith thebuiltin_cmdlineifCONFIG_CMDLINE_BOOLis set. Previously this functional was in thesetup_arch, but we need to move it for getting actual command line as early as possible in thearch/x86/kernel/head{32,64}.cfor the earlyprintk setup.Changes:
v2: function renamed from
setup_cmdlinetosetup_builtin_cmdlineto avoid conflict with thesetup_cmdlinefrom thearch/x86/kernel/kexec-bzimage64.c
Quoted 7 lines
Signed-off-by Alexander Kuleshov <[email protected]>--- arch/x86/include/asm/setup.h | 3 ++- arch/x86/kernel/head32.c | 1 + arch/x86/kernel/head64.c | 1 + arch/x86/kernel/setup.c | 28 +++++++++++++++------------- 4 files changed, 19 insertions(+), 14 deletions(-)
Use checkpatch for your patches, some of the issues it points out are valid:
ERROR: code indent should use tabs where possible
#63: FILE: arch/x86/kernel/head32.c:34:
+ setup_builtin_cmdline();$
WARNING: please, no spaces at the start of a line
#63: FILE: arch/x86/kernel/head32.c:34:
+ setup_builtin_cmdline();$
ERROR: code indent should use tabs where possible
#75: FILE: arch/x86/kernel/head64.c:174:
+ setup_builtin_cmdline();$
WARNING: please, no spaces at the start of a line
#75: FILE: arch/x86/kernel/head64.c:174:
+ setup_builtin_cmdline();$
ERROR: open brace '{' following function declarations go on the next line #87: FILE: arch/x86/kernel/setup.c:848:
+void __init setup_builtin_cmdline(void) {
total: 3 errors, 3 warnings, 70 lines checked
NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or
scripts/cleanfile
Your patch has style problems, please review.
If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.
Signature · 5 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--Re: [PATCH v2 1/2] x86/setup: introduce setup_bultin_cmdline
In reply to Alexander KuleshovQuoted 6 lines · Alexander Kuleshov
This patch introduces
setup_builtin_cmdlinefunction which appends/overridesboot_command_linewith thebuiltin_cmdlineifCONFIG_CMDLINE_BOOLis set. Previously this functional was in thesetup_arch, but we need to move it for getting actual command line as early as possible in thearch/x86/kernel/head{32,64}.cfor the earlyprintk setup.
Thanks for update. See my comments below. Don't forget to address what Borislav told already twice.
Quoted 4 lines
Changes:
v2: function renamed from
setup_cmdlinetosetup_builtin_cmdlineto avoid conflict with thesetup_cmdlinefrom thearch/x86/kernel/kexec-bzimage64.c
You mare remove those lines since it should be a part of cover letter now. Or, if you still wish to have them, move after --- line.
Quoted 14 lines
Signed-off-by Alexander Kuleshov <[email protected]>--- arch/x86/include/asm/setup.h | 3 ++- arch/x86/kernel/head32.c | 1 + arch/x86/kernel/head64.c | 1 + arch/x86/kernel/setup.c | 28 +++++++++++++++------------- 4 files changed, 19 insertions(+), 14 deletions(-)arch/x86/include/asm/setup.h +0
-0
arch/x86/include/asm/setup.h line 30
Quoted 7 lines
arch/x86/include/asm/setup.h +1
-0@@ -24,6 +24,7 @@#define OLD_CL_ADDRESS 0x020/* Relative to real mode data */ #define NEW_CL_POINTER 0x228/* Relative to real mode data */ +#ifndef __ASSEMBLY__#include <asm/bootparam.h> #include <asm/x86_init.h>
This chunk is not needed.
arch/x86/include/asm/setup.h asmlinkage void __init i386_start_kernel(void); · line 120
Quoted 5 lines
arch/x86/include/asm/setup.h +0
-1@@ -117,8 +118,8 @@ asmlinkage void __init i386_start_kernel(void);#else asmlinkage void __init x86_64_start_kernel(char *real_mode); asmlinkage void __init x86_64_start_reservations(char *real_mode_data); -
Why? It shouldn't be here since it's redundant change.
Quoted 42 lines
arch/x86/include/asm/setup.h +1
-0#endif /* __i386__ */ +void __init setup_builtin_cmdline (void );#endif /* _SETUP */ #else #define RESERVE_BRK (name,sz) \arch/x86/kernel/head32.c +1
-0@@ -31,6 +31,7 @@ static void __init i386_default_early_setup(void) asmlinkage __visible void __init i386_start_kernel(void) { +setup_builtin_cmdline ();cr4_init_shadow ();sanitize_boot_params (&boot_params);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_builtin_cmdline ();/* * Load microcode early on BSP. arch/x86/kernel/setup.c +5
-0@@ -845,6 +845,21 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)return 0 ; } +void __init setup_builtin_cmdline (void ) { +#ifdef CONFIG_CMDLINE_BOOL +#ifdef CONFIG_CMDLINE_OVERRIDE +strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); +#else
arch/x86/kernel/setup.c dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p) · line 862
Quoted 10 lines
arch/x86/kernel/setup.c +10
-0+if (builtin_cmdline[0 ]) { +/* append boot loader cmdline to builtin */ +strlcat (builtin_cmdline," " ,COMMAND_LINE_SIZE ); +strlcat (builtin_cmdline, boot_command_line,COMMAND_LINE_SIZE ); +strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); + } +#endif +#endif +} +
It might be a nice idea to split this to two patches:
1) split helper function,
2) update usage of it.
Quoted 23 lines
arch/x86/kernel/setup.c +0
-13/* * Determine if we were loaded by an EFI loader. If so, then we have also been * passed the efi memmap, systab, etc., so we should use these data structures @@ -973,19 +988,6 @@ void __init setup_arch(char **cmdline_p) bss_resource.start =__pa_symbol (__bss_start); bss_resource.end =__pa_symbol (__bss_stop)-1 ; -#ifdef CONFIG_CMDLINE_BOOL -#ifdef CONFIG_CMDLINE_OVERRIDE -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); -#else -if (builtin_cmdline[0 ]) { -/* append boot loader cmdline to builtin */ -strlcat (builtin_cmdline," " ,COMMAND_LINE_SIZE ); -strlcat (builtin_cmdline, boot_command_line,COMMAND_LINE_SIZE ); -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); - } -#endif -#endif -strlcpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = command_line;
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
PATCH v5 2/2 x86/earlyprintk: setup earlyprintk as early as possible
In reply to Alexander KuleshovThe early_printk function is usable after setup_early_printk will be executed. We pass 'earlyprintk' through the kernel command line. It means that earlyprintk will be usable only after the 'parse_early_param' will be executed. So we have usable earlyprintk only during early boot, kernel decompression and after call of the 'parse_early_param'.
This patch makes setup_early_printk visible for head{32,64}.c So 'early_printk' function will be usabable after decompression of the kernel and before parse_early_param will be called. It also safe if CONFIG_CMDLINE_BOOL and CONFIG_CMDLINE_OVERRIDE are set, because setup_cmdline function will be called before the setup_early_printk.
Tested it with qemu, so early_printk() is usable and prints to serial console right after setup_early_printk function called from arch/x86/kerne/head64.c
--- arch/x86/include/asm/serial.h | 2 ++ arch/x86/kernel/early_printk.c | 25 +++++++++++++++++++++++++ arch/x86/kernel/head32.c | 5 +++++ arch/x86/kernel/head64.c | 8 +++++++- 4 files changed, 39 insertions(+), 1 deletion(-)
arch/x86/include/asm/serial.h +2 -0
@@ -26,4 +26,6 @@ { .uart = 0, BASE_BAUD, 0x3E8, 4, STD_COMX_FLAGS }, /* ttyS2 */ \ { .uart = 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ +int __init setup_early_serial_console(void); + #endif /* _ASM_X86_SERIAL_H */
arch/x86/kernel/early_printk.c +25 -0
@@ -385,4 +385,29 @@ static int __init setup_early_printk(char *buf)return 0 ; } +int __init setup_early_serial_console (void ) +{ +#ifdef CONFIG_EARLY_PRINTK +char *arg; + +/* +* make sure that we have: +* "serial,0x3f8,115200" +* "serial,ttyS0,115200" +* "ttyS0,115200" +*/ + arg =strstr (boot_command_line,"earlyprintk=serial" ); +if (!arg) + arg =strstr (boot_command_line,"earlyprintk=ttyS" ); +if (!arg) +return -1 ; + + arg =strstr (boot_command_line,"earlyprintk=" ); +/* += strlen("earlyprintk"); */ + arg +=12 ; + +return setup_early_printk (arg); +#endif +} +early_param ("earlyprintk" , setup_early_printk);
arch/x86/kernel/head32.c +5 -0
@@ -32,6 +32,11 @@ static void __init i386_default_early_setup(void) asmlinkage __visible void __init i386_start_kernel(void) {setup_builtin_cmdline (); +setup_early_serial_console (); + +if (console_loglevel >=CONSOLE_LOGLEVEL_DEBUG ) +early_printk ("Kernel alive\n" ); +cr4_init_shadow ();sanitize_boot_params (&boot_params);
arch/x86/kernel/head64.c +7 -1
@@ -28,6 +28,7 @@#include <asm/bootparam_utils.h> #include <asm/microcode.h> #include <asm/kasan.h> +#include <asm/serial.h> /* * Manage page tables very early on.
@@ -171,7 +172,12 @@ 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_builtin_cmdline (); + +setup_builtin_cmdline (); +setup_early_serial_console (); + +if (console_loglevel >=CONSOLE_LOGLEVEL_DEBUG ) +early_printk ("Kernel alive\n" );/* * Load microcode early on BSP.
Signature · 1 line
2.4.0
Quoted 15 lines · Alexander Kuleshov
The
early_printkfunction is usable aftersetup_early_printkwill be executed. We pass 'earlyprintk' through the kernel command line. It means that earlyprintk will be usable only after the 'parse_early_param' will be executed. So we have usable earlyprintk only during early boot, kernel decompression and after call of the 'parse_early_param'.This patch makes
setup_early_printkvisible for head{32,64}.c So 'early_printk' function will be usabable after decompression of the kernel and beforeparse_early_paramwill be called. It also safe ifCONFIG_CMDLINE_BOOLandCONFIG_CMDLINE_OVERRIDEare set, becausesetup_cmdlinefunction will be called before thesetup_early_printk.Tested it with qemu, so
early_printk()is usable and prints to serial console right aftersetup_early_printkfunction called fromarch/x86/kerne/head64.c
Quoted 7 lines
Signed-off-by Alexander Kuleshov <[email protected]>--- arch/x86/include/asm/serial.h | 2 ++ arch/x86/kernel/early_printk.c | 25 +++++++++++++++++++++++++ arch/x86/kernel/head32.c | 5 +++++ arch/x86/kernel/head64.c | 8 +++++++- 4 files changed, 39 insertions(+), 1 deletion(-)
Also, when you send the patches, send them to yourself first and try applying them. This way you can check whether your sending path doesn't mangle them for some reason.
And ditto:
ERROR: code indent should use tabs where possible
#91: FILE: arch/x86/kernel/head32.c:35:
+ setup_early_serial_console();$
WARNING: please, no spaces at the start of a line
#91: FILE: arch/x86/kernel/head32.c:35:
+ setup_early_serial_console();$
ERROR: code indent should use tabs where possible
#94: FILE: arch/x86/kernel/head32.c:38:
+ early_printk("Kernel alive\n");$
WARNING: please, no spaces at the start of a line
#94: FILE: arch/x86/kernel/head32.c:38:
+ early_printk("Kernel alive\n");$
total: 2 errors, 3 warnings, 66 lines checked
NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or
scripts/cleanfile
Your patch has style problems, please review.
Signature · 5 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--Quoted 6 lines · Alexander Kuleshov
The
early_printkfunction is usable aftersetup_early_printkwill be executed. We pass 'earlyprintk' through the kernel command line. It means that earlyprintk will be usable only after the 'parse_early_param' will be executed. So we have usable earlyprintk only during early boot, kernel decompression and after call of the 'parse_early_param'. This patchset makes earlyprintk usable before the call of the 'parse_early_param'.
Better, though it would be good if native speaker fixes the wording.
P.S. Don't resend version too fast (wait for maybe couple of days for others to give their comments). Actually this one must be v6, but you may use that number in next iteration.
Quoted 46 lines
These patchset provides two patches:
1. Move handling of the builtin command line to the separate function from the
setup_arch. Now we can call it from thearch/x86/kernel/head{32,64}.c, and find 'earlyprintk' kernel command line paramter there.2. Provide
setup_serial_consolefunction to setup serial earlyprintk in thearch/x86/kernel/head{32,64}.cChanges v5:
* Call
setup_builtin_cmdlineinstead ofsetup_cmdlineChanges v4:
* Move
setup_early_serial_consolefrom theinclude/linux/printk.hto thearch/x86/include/asm/serial.h, because this function is only for x86 now.Changes v3:
* Call
setup_cmdlinebeforesetup_early_printk;
*setup_early_printkcall wrapped with thesetup_early_serial_consolewhich checks that 'serial' given to the earlyprintk command line option. This prevents call of thesetup_early_printkwith the given pciserial/dbgp/efi, because they are usingearly_ioremap.Changes v2:
* Comment added before the
setup_early_printkcall;
* Added information about testing to the commit message.Alexander Kuleshov (2):
x86/setup: updateboot_command_linewithbuiltin_cmdlinein separate
function
x86/earlyprintk: setup earlyprintk as early as possiblearch/x86/include/asm/serial.h | 2 ++ arch/x86/include/asm/setup.h | 3 ++- arch/x86/kernel/early_printk.c | 25 +++++++++++++++++++++++++ arch/x86/kernel/head32.c | 6 ++++++ arch/x86/kernel/head64.c | 7 +++++++ arch/x86/kernel/setup.c | 28 +++++++++++++++------------- 6 files changed, 57 insertions(+), 14 deletions(-)
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
v6 cover [PATCH v6 0/3]
In reply to Alexander KuleshovThe early_printk function is usable after setup_early_printk will be executed. We pass 'earlyprintk' through the kernel command line. It means that earlyprintk will be usable only after the 'parse_early_param' will be executed. So we have usable earlyprintk only during early boot, kernel decompression and after call of the 'parse_early_param'. This patchset makes earlyprintk usable before the call of the 'parse_early_param'.
These patchset provides following changes:
1. Move handling of the builtin command line to the separate function from the setup_arch. Now we can call it from the arch/x86/kernel/head{32,64}.c, and find 'earlyprintk' kernel command line paramter there.
2. Provide setup_serial_console function to setup serial earlyprintk in the arch/x86/kernel/head{32,64}.c
v6:
* Style fixes.
* Call of the suetp_builtin_cmdline moved to the separate patch.
v5:
* Call setup_builtin_cmdline instead of setup_cmdline
v4:
* Move setup_early_serial_console from the include/linux/printk.h to the arch/x86/include/asm/serial.h, because this function is only for x86 now.
v3:
* Call setup_cmdline before setup_early_printk;
* setup_early_printk call wrapped with the setup_early_serial_console which checks that 'serial' given to the earlyprintk command line option. This prevents call of the setup_early_printk with the given pciserial/dbgp/efi, because they are using early_ioremap.
v2:
* Comment added before the setup_early_printk call;
* Added information about testing to the commit message.
Alexander Kuleshov (3):
x86/setup: introduce setup_bultin_cmdline x86/setup: setup builtin command line as early as possible x86/earlyprintk: setup earlyprintk as early as possible
arch/x86/include/asm/serial.h | 3 +++ arch/x86/include/asm/setup.h | 1 + arch/x86/kernel/early_printk.c | 25 +++++++++++++++++++++++++ arch/x86/kernel/head32.c | 6 ++++++ arch/x86/kernel/head64.c | 6 ++++++ arch/x86/kernel/setup.c | 29 ++++++++++++++++------------- 6 files changed, 57 insertions(+), 13 deletions(-)
--
2.4.0
PATCH v3 1/3 x86/setup: introduce setup_bultin_cmdline
This patch introduces the setup_builtin_cmdline function which appends or overrides boot_command_line with the builtin_cmdline if CONFIG_CMDLINE_BOOL is set.
Previously this functional was in the setup_arch, but we need to move it for getting actual command line as early as possible in the arch/x86/kernel/head{32,64}.c for the earlyprintk setup.
--- arch/x86/include/asm/setup.h | 1 + arch/x86/kernel/setup.c | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-)
arch/x86/include/asm/setup.h +1 -0
@@ -119,6 +119,7 @@ asmlinkage void __init x86_64_start_kernel(char *real_mode); asmlinkage void __init x86_64_start_reservations(char *real_mode_data);#endif /* __i386__ */ +void __init setup_builtin_cmdline (void );#endif /* _SETUP */ #else #define RESERVE_BRK (name,sz) \
arch/x86/kernel/setup.c +16 -13
@@ -845,6 +845,22 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)return 0 ; } +void __init setup_builtin_cmdline (void ) +{ +#ifdef CONFIG_CMDLINE_BOOL +#ifdef CONFIG_CMDLINE_OVERRIDE +strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); +#else +if (builtin_cmdline[0 ]) { +/* append boot loader cmdline to builtin */ +strlcat (builtin_cmdline," " ,COMMAND_LINE_SIZE ); +strlcat (builtin_cmdline, boot_command_line,COMMAND_LINE_SIZE ); +strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); + } +#endif +#endif +} +/* * Determine if we were loaded by an EFI loader. If so, then we have also been * passed the efi memmap, systab, etc., so we should use these data structures
@@ -973,19 +989,6 @@ void __init setup_arch(char **cmdline_p) bss_resource.start =__pa_symbol (__bss_start); bss_resource.end =__pa_symbol (__bss_stop)-1 ; -#ifdef CONFIG_CMDLINE_BOOL -#ifdef CONFIG_CMDLINE_OVERRIDE -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); -#else -if (builtin_cmdline[0 ]) { -/* append boot loader cmdline to builtin */ -strlcat (builtin_cmdline," " ,COMMAND_LINE_SIZE ); -strlcat (builtin_cmdline, boot_command_line,COMMAND_LINE_SIZE ); -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); - } -#endif -#endif -strlcpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = command_line;
--
2.4.0
Re: [PATCH v3 1/3] x86/setup: introduce setup_bultin_cmdline
Quoted 4 lines · Alexander Kuleshov
This patch introduces the
setup_builtin_cmdlinefunction which appends or overridesboot_command_linewith thebuiltin_cmdlineifCONFIG_CMDLINE_BOOLis set.
Couple of comments.
First of all,6 is a property of each patch in the series, since series means the logically linked pieces of changes. So, Why v3 is here?
Quoted 56 lines
Previously this functional was in the
setup_arch, but we need to move it for getting actual command line as early as possible in thearch/x86/kernel/head{32,64}.cfor the earlyprintk setup.Signed-off-by Alexander Kuleshov <[email protected]>--- arch/x86/include/asm/setup.h | 1 + arch/x86/kernel/setup.c | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-)arch/x86/include/asm/setup.h +1
-0@@ -119,6 +119,7 @@ asmlinkage void __init x86_64_start_kernel(char *real_mode); asmlinkage void __init x86_64_start_reservations(char *real_mode_data);#endif /* __i386__ */ +void __init setup_builtin_cmdline (void );#endif /* _SETUP */ #else #define RESERVE_BRK (name,sz) \arch/x86/kernel/setup.c +16
-3@@ -845,6 +845,22 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)return 0 ; } +void __init setup_builtin_cmdline (void ) +{ +#ifdef CONFIG_CMDLINE_BOOL +#ifdef CONFIG_CMDLINE_OVERRIDE +strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); +#else +if (builtin_cmdline[0 ]) { +/* append boot loader cmdline to builtin */ +strlcat (builtin_cmdline," " ,COMMAND_LINE_SIZE ); +strlcat (builtin_cmdline, boot_command_line,COMMAND_LINE_SIZE ); +strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); + } +#endif +#endif +} +/* * Determine if we were loaded by an EFI loader. If so, then we have also been * passed the efi memmap, systab, etc., so we should use these data structures @@ -973,19 +989,6 @@ void __init setup_arch(char **cmdline_p) bss_resource.start =__pa_symbol (__bss_start); bss_resource.end =__pa_symbol (__bss_stop)-1 ; -#ifdef CONFIG_CMDLINE_BOOL -#ifdef CONFIG_CMDLINE_OVERRIDE -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE );
arch/x86/kernel/setup.c void __init setup_arch(char **cmdline_p) · line 988
Quoted 10 lines
arch/x86/kernel/setup.c +0
-10-#else -if (builtin_cmdline[0 ]) { -/* append boot loader cmdline to builtin */ -strlcat (builtin_cmdline," " ,COMMAND_LINE_SIZE ); -strlcat (builtin_cmdline, boot_command_line,COMMAND_LINE_SIZE ); -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); - } -#endif -#endif -
This one breaks kernel to work. You have to call setup_builtin_cmdline() here.
Quoted 5 lines
arch/x86/kernel/setup.c +0
-1strlcpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = command_line; --2.4.0
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Re: [PATCH v3 1/3] x86/setup: introduce setup_bultin_cmdline
Hi Andy,
2015-05-12 16:50 GMT+06:00 Andy Shevchenko <[email protected]>:
Quoted 7 lines
This one breaks kernel to work. You have to call
setup_builtin_cmdline()here.Quoted 3 lines
strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line;
Why? The setup_builtin_cmdline will be called before setup_arch in the head{32, 64}.c,
or I've missed something?
Re: [PATCH v3 1/3] x86/setup: introduce setup_bultin_cmdline
Quoted 8 lines · Alexander Kuleshov
Hi Andy,
2015-05-12 16:50 GMT+06:00 Andy Shevchenko <[email protected]>:
Quoted 4 lines
This one breaks kernel to work. You have to call
setup_builtin_cmdline()here.
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line;Why? The
setup_builtin_cmdlinewill be called beforesetup_archin the head{32, 64}.c,
or I've missed something?
Yes, you missed the call here in *this* patch.
So, here is a trade off between smaller understandable changes and bisectability. On one hand you may go like you did previously (one patch for two changes), on the other — make it work after each patch applied one-by-one.
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
PATCH 2/3 x86/setup: handle builtin command line as early as possible
In reply to Alexander KuleshovThis patch adds the call of the setup_builtin_cmdline to handle builtin command line before we will setup earlyprintk.
--- arch/x86/kernel/head32.c | 1 + arch/x86/kernel/head64.c | 1 + 2 files changed, 2 insertions(+)
arch/x86/kernel/head32.c +1 -0
@@ -31,6 +31,7 @@ static void __init i386_default_early_setup(void) asmlinkage __visible void __init i386_start_kernel(void) { +setup_builtin_cmdline ();cr4_init_shadow ();sanitize_boot_params (&boot_params);
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_builtin_cmdline ();/* * Load microcode early on BSP.
--
2.4.0
PATCH v6 3/3 x86/earlyprintk: setup earlyprintk as early as possible
In reply to Alexander KuleshovThe early_printk function is usable only after the setup_early_printk will be executed. We pass 'earlyprintk' through the kernel command line, so it will be usable only after the 'parse_early_param' will be executed. This means that we have usable earlyprintk only during early boot, kernel decompression and after call of the 'parse_early_param'. This patchset makes earlyprintk usable before the call of the 'parse_early_param'.
This patch makes setup_early_printk visible for head{32,64}.c. So the 'early_printk' function will be usabable after decompression of the kernel and before parse_early_param will be called. It also must be safe if CONFIG_CMDLINE_BOOL and CONFIG_CMDLINE_OVERRIDE are set, because setup_cmdline function will be called before setup_early_printk.
Tested it with qemu, so early_printk() is usable and prints to serial console right after setup_early_printk function called.
--- arch/x86/include/asm/serial.h | 3 +++ arch/x86/kernel/early_printk.c | 25 +++++++++++++++++++++++++ arch/x86/kernel/head32.c | 5 +++++ arch/x86/kernel/head64.c | 5 +++++ 4 files changed, 38 insertions(+)
arch/x86/include/asm/serial.h +3 -0
@@ -26,4 +26,7 @@ { .uart = 0, BASE_BAUD, 0x3E8, 4, STD_COMX_FLAGS }, /* ttyS2 */ \ { .uart = 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ +/* used by arch/x86/kernel/head{32,64}.c */ +int __init setup_early_serial_console(void); + #endif /* _ASM_X86_SERIAL_H */
arch/x86/kernel/early_printk.c +25 -0
@@ -385,4 +385,29 @@ static int __init setup_early_printk(char *buf)return 0 ; } +int __init setup_early_serial_console (void ) +{ +#ifdef CONFIG_EARLY_PRINTK +char *arg; + +/* +* make sure that we have: +* "serial,0x3f8,115200" +* "serial,ttyS0,115200" +* "ttyS0,115200" +*/ + arg =strstr (boot_command_line,"earlyprintk=serial" ); +if (!arg) + arg =strstr (boot_command_line,"earlyprintk=ttyS" ); +if (!arg) +return -1 ; + + arg =strstr (boot_command_line,"earlyprintk=" ); +/* += strlen("earlyprintk"); */ + arg +=12 ; + +return setup_early_printk (arg); +#endif +} +early_param ("earlyprintk" , setup_early_printk);
arch/x86/kernel/head32.c +5 -0
@@ -32,6 +32,11 @@ static void __init i386_default_early_setup(void) asmlinkage __visible void __init i386_start_kernel(void) {setup_builtin_cmdline (); +setup_early_serial_console (); + +if (console_loglevel >=CONSOLE_LOGLEVEL_DEBUG ) +early_printk ("Kernel alive\n" ); +cr4_init_shadow ();sanitize_boot_params (&boot_params);
arch/x86/kernel/head64.c +5 -0
@@ -173,6 +173,11 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)copy_bootdata (__va (real_mode_data));setup_builtin_cmdline (); +setup_early_serial_console (); + +if (console_loglevel >=CONSOLE_LOGLEVEL_DEBUG ) +early_printk ("Kernel alive\n" ); +/* * Load microcode early on BSP. */
--
2.4.0
Quoted 7 lines · Alexander Kuleshov
The
early_printkfunction is usable only after thesetup_early_printkwill be executed. We pass 'earlyprintk' through the kernel command line, so it will be usable only after the 'parse_early_param' will be executed. This means that we have usable earlyprintk only during early boot, kernel decompression and after call of the 'parse_early_param'. This patchset makes earlyprintk usable before the call of the 'parse_early_param'.
Quoted 6 lines
This patch makes
setup_early_printkvisible for head{32,64}.c. So the 'early_printk' function will be usabable after decompression of the kernel and beforeparse_early_paramwill be called. It also must be safe ifCONFIG_CMDLINE_BOOLandCONFIG_CMDLINE_OVERRIDEare set, becausesetup_cmdlinefunction will be called beforesetup_early_printk.
Few comments below.
Quoted 16 lines
Tested it with qemu, so
early_printk()is usable and prints to serial console right aftersetup_early_printkfunction called.Signed-off-by Alexander Kuleshov <[email protected]>--- arch/x86/include/asm/serial.h | 3 +++ arch/x86/kernel/early_printk.c | 25 +++++++++++++++++++++++++ arch/x86/kernel/head32.c | 5 +++++ arch/x86/kernel/head64.c | 5 +++++ 4 files changed, 38 insertions(+)arch/x86/include/asm/serial.h +0
-0
arch/x86/include/asm/serial.h line 31
Quoted 6 lines
arch/x86/include/asm/serial.h +3
-0@@ -26,4 +26,7 @@ { .uart = 0, BASE_BAUD, 0x3E8, 4, STD_COMX_FLAGS }, /* ttyS2 */ \ { .uart = 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ +/* used by arch/x86/kernel/head{32,64}.c */ +int __init setup_early_serial_console(void); +
Actually, have you investigated how this works on the other supported architectures? It might be better to align this with them.
Quoted 10 lines
arch/x86/include/asm/serial.h +0
-0#endif /* _ASM_X86_SERIAL_H */ arch/x86/kernel/early_printk.c +1
-0@@ -385,4 +385,29 @@ static int __init setup_early_printk(char *buf)return 0 ; } +int __init setup_early_serial_console (void )
arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 398
Quoted 10 lines
arch/x86/kernel/early_printk.c +10
-0+{ +#ifdef CONFIG_EARLY_PRINTK +char *arg; + +/* +* make sure that we have: +* "serial,0x3f8,115200" +* "serial,ttyS0,115200" +* "ttyS0,115200" +*/
Indentation and text styling problems.
arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 403
Quoted 5 lines
arch/x86/kernel/early_printk.c +5
-0+ arg =strstr (boot_command_line,"earlyprintk=serial" ); +if (!arg) + arg =strstr (boot_command_line,"earlyprintk=ttyS" ); +if (!arg) +return -1 ;
What about other cases like that described in setup_early_printk()?
arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 410
Quoted 7 lines
arch/x86/kernel/early_printk.c +7
-0+ + arg =strstr (boot_command_line,"earlyprintk=" ); +/* += strlen("earlyprintk"); */ + arg +=12 ; + +return setup_early_printk (arg); +#endif
#ifdef seems redundant here, you already build this module iff EARLY_PRINTK is set.
arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 411
Quoted 1 line
arch/x86/kernel/early_printk.c +1
-0+}
So, the logic of this function seems broken. I don't get why you have to check the contents of earlyprintk parameter.
Quoted 7 lines
arch/x86/kernel/early_printk.c +1
-0+early_param ("earlyprintk" , setup_early_printk);arch/x86/kernel/head32.c +0
-0
arch/x86/kernel/head32.c static void __init i386_default_early_setup(void) · line 38
Quoted 7 lines
arch/x86/kernel/head32.c +4
-0@@ -32,6 +32,11 @@ static void __init i386_default_early_setup(void) asmlinkage __visible void __init i386_start_kernel(void) {setup_builtin_cmdline (); +setup_early_serial_console (); + +if (console_loglevel >=CONSOLE_LOGLEVEL_DEBUG ) +early_printk ("Kernel alive\n" );
This should be unified (like printed "Early printk is initialized" in setup_early_printk() ), moreover what about other architectures?
Quoted 9 lines
arch/x86/kernel/head32.c +1
-0+cr4_init_shadow ();sanitize_boot_params (&boot_params);arch/x86/kernel/head64.c +0
-0
arch/x86/kernel/head64.c asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data) · line 178
Quoted 6 lines
arch/x86/kernel/head64.c +1
-0@@ -173,6 +173,11 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)copy_bootdata (__va (real_mode_data));setup_builtin_cmdline (); +setup_early_serial_console ();
Those two can be grouped in the same way like in previous change (see above).
arch/x86/kernel/head64.c asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data) · line 181
Quoted 3 lines
arch/x86/kernel/head64.c +3
-0+ +if (console_loglevel >=CONSOLE_LOGLEVEL_DEBUG ) +early_printk ("Kernel alive\n" );
Same comment as in above chunk.
Quoted 6 lines
arch/x86/kernel/head64.c +1
-0+/* arch/x86/kernel/head64.c +0
-1* Load microcode early on BSP. */ --2.4.0
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
2015-05-12 17:19 GMT+06:00 Andy Shevchenko <[email protected]>:
Quoted 6 lines
arch/x86/include/asm/serial.h line 31
Quoted 3 lines
arch/x86/include/asm/serial.h +3
-0+/* used by arch/x86/kernel/head{32,64}.c */ +int __init setup_early_serial_console (void ); +Actually, have you investigated how this works on the other supported architectures? It might be better to align this with them.
Yes. In other architetures, earlyprintk setup occurs through 'early_param', as it in the x86 now.
Quoted 14 lines
What about other cases like that described in
setup_early_printk()?arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 410
Quoted 7 lines
arch/x86/kernel/early_printk.c +7
-0+ + arg =strstr (boot_command_line,"earlyprintk=" ); +/* += strlen("earlyprintk"); */ + arg +=12 ; + +return setup_early_printk (arg); +#endif So, the logic of this function seems broken. I don't get why you have to check the contents of earlyprintk parameter.
Because for now we can setup only serial console, for other we need ioremap which is not enabled for this moment. Here we just try to find serial console and setup it, if another argument passed to the 'earlyprintk', it will be parsed in the
'setup_arch'.
Quoted 9 lines
Quoted 7 lines
arch/x86/kernel/head64.c +0
-0@@ -173,6 +173,11 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)copy_bootdata (__va (real_mode_data));
Quoted 7 lines
arch/x86/kernel/head64.c asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data) · line 176
Quoted 3 lines
arch/x86/kernel/head64.c +1
-0setup_builtin_cmdline (); +setup_early_serial_console ();Those two can be grouped in the same way like in previous change (see above).
I'm not sure that I understand this. Can you please, explain what did you mean here.
Thank you.
Quoted 10 lines · Alexander Kuleshov
2015-05-12 17:19 GMT+06:00 Andy Shevchenko <[email protected]>:
Quoted 6 lines
arch/x86/include/asm/serial.h line 31
Quoted 3 lines
arch/x86/include/asm/serial.h +3
-0+/* used by arch/x86/kernel/head{32,64}.c */ +int __init setup_early_serial_console (void ); +Actually, have you investigated how this works on the other supported architectures? It might be better to align this with them.
Yes. In other architetures, earlyprintk setup occurs through '
early_param', as it in the x86 now.
So, which means that instead of this proposal (in a hackish way, since it half-working solution) maybe better to reconsider how you may handle early_param?
Quoted 16 lines
Quoted 4 lines
What about other cases like that described in
setup_early_printk()?Quoted 11 lines
arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 410
Quoted 7 lines
arch/x86/kernel/early_printk.c +7
-0+ + arg =strstr (boot_command_line,"earlyprintk=" ); +/* += strlen("earlyprintk"); */ + arg +=12 ; + +return setup_early_printk (arg); +#endif So, the logic of this function seems broken. I don't get why you have to check the contents of earlyprintk parameter.
Quoted 5 lines
Because for now we can setup only serial console, for other we need ioremap which is not enabled for this moment. Here we just try to find serial console and setup it, if another argument passed to the 'earlyprintk', it will be parsed in the
'setup_arch'.
Even for EFI case?
So, you might redesign that to somehow test if the setup_early_printk() is called in early_param() context or even earlier and depending on that do initializations regarding to possibilities, though I have no idea how to this in clean way.
Currently you have two places where you check the content of the parameter, which is not okay from my p.o.v.
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
arch/x86/kernel/head64.c +0
-0@@ -173,6 +173,11 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)copy_bootdata (__va (real_mode_data));setup_builtin_cmdline ();
Quoted 8 lines
Quoted 5 lines
arch/x86/kernel/head64.c asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data) · line 178
Quoted 1 line
arch/x86/kernel/head64.c +1
-0+setup_early_serial_console ();Those two can be grouped in the same way like in previous change (see above).
I'm not sure that I understand this. Can you please, explain what did you mean here.
It's about style. Just make empty line before setup_builtin_cmdline() instead of doing this in between two setup_ functions.
Quoted 2 lines
Thank you.
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
2015-05-12 23:58 GMT+06:00 Andy Shevchenko <[email protected]>:
Quoted 10 lines
Quoted 7 lines
Quoted 1 line
Because for now we can setup only serial console, for other we need ioremap which is not enabled for this moment. Here we just try to find serial console and setup it, if another argument passed to the 'earlyprintk', it will be parsed in the
'setup_arch'.Even for EFI case?
If I understand correctly, yes. As we can read from early_efi_map_fb function (which setup with early_initcall) comment: efi earlyprintk need use early_ioremap
to map the framebuffer.