x86/setup: update boot_command_line with builtin_cmdline in separate function
PATCH 1/2 x86/setup: update boot_command_line with builtin_cmdline in separate function
This patch introduces setup_cmdline function which appends/overrides boot_command_linew with 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
--- arch/x86/kernel/head32.c | 1 + arch/x86/kernel/head64.c | 1 + arch/x86/kernel/setup.c | 31 ++++++++++++++++++------------- include/linux/init.h | 6 +++++- 4 files changed, 25 insertions(+), 14 deletions(-)
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_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_cmdline ();/* * Load microcode early on BSP.
arch/x86/kernel/setup.c +18 -13
@@ -841,6 +841,24 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p) }/* +* Append/Override boot command line with builtin command line if need +*/ +void __init setup_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 * for initialization. Note, the efi init code path is determined by the
@@ -968,19 +986,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;
include/linux/init.h +5 -1
@@ -152,7 +152,11 @@ void setup_arch(char **);void prepare_namespace (void );void __init load_default_modules (void );int __init init_rootfs (void ); - +#ifdef CONFIG_CMDLINE_BOOL +void __init setup_cmdline (void ); +#else +static void __init setup_cmdline (void ) {}; +#endif extern void (*late_time_init)(void );extern bool initcall_debug;
Signature · 1 line
2.3.3.611.g09038fc.dirty
PATCH v4 2/2 x86/earlyprintk: setup earlyprintk as early as possible
As setup_early_printk 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 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 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 from arch/x86/kerne/head64.c
Changes v1->v2:
* Comment added before the setup_early_printk call;
* Added information about testing to the commit message.
Changes v2->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 v3->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.
--- arch/x86/include/asm/serial.h | 7 +++++++ arch/x86/kernel/early_printk.c | 31 +++++++++++++++++++++++++++++-- arch/x86/kernel/head32.c | 5 +++++ arch/x86/kernel/head64.c | 9 ++++++++- 4 files changed, 49 insertions(+), 3 deletions(-)
arch/x86/include/asm/serial.h +7 -0
@@ -26,4 +26,11 @@ { .uart = 0, BASE_BAUD, 0x3E8, 4, STD_COMX_FLAGS }, /* ttyS2 */ \ { .uart = 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ + +#ifdef CONFIG_EARLY_PRINTK +int setup_early_serial_console(void); +#else +static void setup_early_serial_console(void) {}; +#endif + #endif /* _ASM_X86_SERIAL_H */
arch/x86/kernel/early_printk.c +29 -2
@@ -11,6 +11,7 @@#include <asm/processor.h> #include <asm/fcntl.h> #include <asm/setup.h> +#include <asm/serial.h> #include <xen/hvc-console.h> #include <asm/pci-direct.h> #include <asm/fixmap.h>
@@ -342,14 +343,16 @@ static int __init setup_early_printk(char *buf) keep = (strstr (buf,"keep" ) !=NULL );while (*buf !='\0' ) { -if (!strncmp (buf,"serial" ,6 )) { +if (!strncmp (buf,"serial" ,6 ) && + early_serial_console.index ==-1 ) { buf +=6 ;early_serial_init (buf);early_console_register (&early_serial_console, keep);if (!strncmp (buf,",ttyS" ,5 )) buf +=5 ; } -if (!strncmp (buf,"ttyS" ,4 )) { +if (!strncmp (buf,"ttyS" ,4 ) && + early_serial_console.index ==-1 ) {early_serial_init (buf +4 );early_console_register (&early_serial_console, keep); }
@@ -391,4 +394,28 @@ static int __init setup_early_printk(char *buf)return 0 ; } +int setup_early_serial_console () { +#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
@@ -19,6 +19,7 @@#include <asm/bios_ebda.h> #include <asm/tlbflush.h> #include <asm/bootparam_utils.h> +#include <asm/serial.h> static void __init i386_default_early_setup (void ) {
@@ -32,6 +33,10 @@ static void __init i386_default_early_setup(void) asmlinkage __visible void __init i386_start_kernel(void) {setup_cmdline (); +/* setup serial console as early as possible */ +setup_early_serial_console (); +early_printk ("Early serial console is active\n" ); +cr4_init_shadow ();sanitize_boot_params (&boot_params);
arch/x86/kernel/head64.c +8 -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.
@@ -172,12 +173,16 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)copy_bootdata (__va (real_mode_data));setup_cmdline (); +/* setup serial console as early as possible */ +setup_early_serial_console (); +early_printk ("Early serial console is active\n" );/* * Load microcode early on BSP. */ load_ucode_bsp (); +if (console_loglevel >=CONSOLE_LOGLEVEL_DEBUG )early_printk ("Kernel alive\n" );
@@ -193,8 +198,10 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)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_serial_console (); + }reserve_ebda_region ();
Signature · 1 line
2.3.3.611.g09038fc.dirty
PATCH v2 1/2 x86/setup: update boot_command_line with builtin_cmdline in separate function
In reply to Alexander KuleshovThis patch introduces setup_cmdline function which appends/overrides boot_command_linew with 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
--- arch/x86/kernel/head32.c | 1 + arch/x86/kernel/head64.c | 1 + arch/x86/kernel/setup.c | 31 ++++++++++++++++++------------- include/linux/init.h | 6 +++++- 4 files changed, 25 insertions(+), 14 deletions(-)
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_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_cmdline ();/* * Load microcode early on BSP.
arch/x86/kernel/setup.c +18 -13
@@ -841,6 +841,24 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p) }/* +* Append/Override boot command line with builtin command line if need +*/ +void __init setup_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 * for initialization. Note, the efi init code path is determined by the
@@ -968,19 +986,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;
include/linux/init.h +1 -0
@@ -152,7 +152,11 @@ void setup_arch(char **);void prepare_namespace (void );void __init load_default_modules (void );int __init init_rootfs (void ); +void __init setup_cmdline (void );extern void (*late_time_init)(void );extern bool initcall_debug;
Signature · 1 line
2.3.3.611.g09038fc.dirty
PATCH v5 2/2 x86/earlyprintk: setup earlyprintk as early as possible
In reply to Alexander KuleshovAs setup_early_printk 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 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 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 from arch/x86/kerne/head64.c
Changes v1->v2:
* Comment added before the setup_early_printk call;
* Added information about testing to the commit message.
Changes v2->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 v3->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 v4->v5:
* Add check for console_log_level before call of the early_printk()
--- arch/x86/include/asm/serial.h | 7 +++++++ arch/x86/kernel/early_printk.c | 31 +++++++++++++++++++++++++++++-- arch/x86/kernel/head32.c | 5 +++++ arch/x86/kernel/head64.c | 9 ++++++++- include/linux/init.h | 4 ---- 5 files changed, 49 insertions(+), 7 deletions(-)
arch/x86/include/asm/serial.h +7 -0
@@ -26,4 +26,11 @@ { .uart = 0, BASE_BAUD, 0x3E8, 4, STD_COMX_FLAGS }, /* ttyS2 */ \ { .uart = 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ + +#ifdef CONFIG_EARLY_PRINTK +int setup_early_serial_console(void); +#else +static void setup_early_serial_console(void) {}; +#endif + #endif /* _ASM_X86_SERIAL_H */
arch/x86/kernel/early_printk.c +29 -2
@@ -11,6 +11,7 @@#include <asm/processor.h> #include <asm/fcntl.h> #include <asm/setup.h> +#include <asm/serial.h> #include <xen/hvc-console.h> #include <asm/pci-direct.h> #include <asm/fixmap.h>
@@ -342,14 +343,16 @@ static int __init setup_early_printk(char *buf) keep = (strstr (buf,"keep" ) !=NULL );while (*buf !='\0' ) { -if (!strncmp (buf,"serial" ,6 )) { +if (!strncmp (buf,"serial" ,6 ) && + early_serial_console.index ==-1 ) { buf +=6 ;early_serial_init (buf);early_console_register (&early_serial_console, keep);if (!strncmp (buf,",ttyS" ,5 )) buf +=5 ; } -if (!strncmp (buf,"ttyS" ,4 )) { +if (!strncmp (buf,"ttyS" ,4 ) && + early_serial_console.index ==-1 ) {early_serial_init (buf +4 );early_console_register (&early_serial_console, keep); }
@@ -391,4 +394,28 @@ static int __init setup_early_printk(char *buf)return 0 ; } +int setup_early_serial_console () { +#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 +6 -0
@@ -19,6 +19,7 @@#include <asm/bios_ebda.h> #include <asm/tlbflush.h> #include <asm/bootparam_utils.h> +#include <asm/serial.h> static void __init i386_default_early_setup (void ) {
@@ -32,6 +33,11 @@ static void __init i386_default_early_setup(void) asmlinkage __visible void __init i386_start_kernel(void) {setup_cmdline (); +/* setup serial console as early as possible */ +setup_early_serial_console (); +if (console_loglevel >=CONSOLE_LOGLEVEL_DEBUG ) +early_printk ("Early serial console is active\n" ); +cr4_init_shadow ();sanitize_boot_params (&boot_params);
arch/x86/kernel/head64.c +9 -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.
@@ -172,12 +173,17 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)copy_bootdata (__va (real_mode_data));setup_cmdline (); +/* setup serial console as early as possible */ +setup_early_serial_console (); +if (console_loglevel >=CONSOLE_LOGLEVEL_DEBUG ) +early_printk ("Early serial console is active\n" );/* * Load microcode early on BSP. */ load_ucode_bsp (); +if (console_loglevel >=CONSOLE_LOGLEVEL_DEBUG )early_printk ("Kernel alive\n" );
@@ -193,8 +198,10 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)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_serial_console (); + }reserve_ebda_region ();
Signature · 1 line
2.3.3.611.g09038fc.dirty