x86: Do not write into VGA memory space if there is no VGA device in the system
PATCH v3 1/1 x86: Do not write into VGA memory space if there is no VGA device in the system
Ensure that early_printk() does not write into VGA memory space if there is not VGA device in the system.
---
v3:
Changes are now limited to early_printk.c. Functionality is retained, meaning there will still be output on the VGA console before setup_early_printk() is called, but only if a VGA device is known to exist in the system.
arch/x86/kernel/early_printk.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-)
arch/x86/kernel/early_printk.c +13 -4
@@ -170,10 +170,13 @@ asmlinkage void early_printk(const char *fmt, ...)int n;va_list ap; -va_start (ap, fmt); - n =vscnprintf (buf,sizeof (buf), fmt, ap); - early_console->write (early_console, buf, n); -va_end (ap); +if (early_console && (early_console_initialized || + boot_params.screen_info.orig_video_isVGA ==1 )) { +va_start (ap, fmt); + n =vscnprintf (buf,sizeof (buf), fmt, ap); + early_console->write (early_console, buf, n); +va_end (ap); + } }static inline void early_console_register (struct console *con,int keep_early)
@@ -233,6 +236,12 @@ static int __init setup_early_printk(char *buf)#endif buf++; } + +/* If there is no VGA device, don't try to use it as early console. */ +if (early_console == &early_vga_console && + boot_params.screen_info.orig_video_isVGA !=1 ) + early_console =NULL ; +return 0 ; }
Signature · 1 line
1.7.0.87.g0901d
Guenter Roeck kirjoitti:
Quoted 36 lines
Ensure that
early_printk()does not write into VGA memory space if there is not VGA device in the system.Signed-off-by Guenter Roeck <[email protected]>---
v3:
Changes are now limited toearly_printk.c. Functionality is retained, meaning there will still be output on the VGA console beforesetup_early_printk()is called, but only if a VGA device is known to exist in the system.arch/x86/kernel/early_printk.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-)arch/x86/kernel/early_printk.c +7
-4@@ -170,10 +170,13 @@ asmlinkage void early_printk(const char *fmt, ...)int n;va_list ap; -va_start (ap, fmt); - n =vscnprintf (buf,sizeof (buf), fmt, ap); - early_console->write (early_console, buf, n); -va_end (ap); +if (early_console && (early_console_initialized || + boot_params.screen_info.orig_video_isVGA ==1 )) { +va_start (ap, fmt); + n =vscnprintf (buf,sizeof (buf), fmt, ap); + early_console->write (early_console, buf, n); +va_end (ap); + } }static inline void early_console_register (struct console *con,int keep_early)
arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 243
Quoted 8 lines
arch/x86/kernel/early_printk.c +5
-0@@ -233,6 +236,12 @@ static int __init setup_early_printk(char *buf)#endif buf++; } + +/* If there is no VGA device, don't try to use it as early console. */ +if (early_console == &early_vga_console && + boot_params.screen_info.orig_video_isVGA !=1 ) + early_console =NULL ;
Wouldn't it be better to switch to, say, serial console here to avoid the NULL check in early_printk()?
Quoted 4 lines
arch/x86/kernel/early_printk.c +1
-0+return 0 ; }
Quoted 35 lines · Pekka Enberg
Guenter Roeck kirjoitti:
Quoted 34 lines
Ensure that
early_printk()does not write into VGA memory space if there is not VGA device in the system.Signed-off-by Guenter Roeck <[email protected]>---
v3:
Changes are now limited toearly_printk.c. Functionality is retained, meaning there will still be output on the VGA console beforesetup_early_printk()is called, but only if a VGA device is known to exist in the system.arch/x86/kernel/early_printk.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-)arch/x86/kernel/early_printk.c +7
-4@@ -170,10 +170,13 @@ asmlinkage void early_printk(const char *fmt, ...)int n;va_list ap; -va_start (ap, fmt); - n =vscnprintf (buf,sizeof (buf), fmt, ap); - early_console->write (early_console, buf, n); -va_end (ap); +if (early_console && (early_console_initialized || + boot_params.screen_info.orig_video_isVGA ==1 )) { +va_start (ap, fmt); + n =vscnprintf (buf,sizeof (buf), fmt, ap); + early_console->write (early_console, buf, n); +va_end (ap); + } }
Quoted 14 lines
arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 243
Quoted 10 lines
arch/x86/kernel/early_printk.c +5
-0static inline void early_console_register (struct console *con,int keep_early)@@ -233,6 +236,12 @@ static int __init setup_early_printk(char *buf)#endif buf++; } + +/* If there is no VGA device, don't try to use it as early console. */ +if (early_console == &early_vga_console && + boot_params.screen_info.orig_video_isVGA !=1 ) + early_console =NULL ;Wouldn't it be better to switch to, say, serial console here to avoid the NULL check in
early_printk()?
This would be another possibility.
However, since the serial console was not explicitly selected, it would possibly not be initialized. My understanding is that Peter had a problem with that.
One can argue that it would still be better to select the serial console in that case, even though it might not be initialized. Actually, most likely it is (if it exists), since the system must presumably have some means to communicate with the world.
I am pretty much open to either option, if that results in the patch being accepted. Just let me know which way to go.
Guenter
Quoted 55 lines · Guenter Roeck
Quoted 35 lines · Pekka Enberg
Guenter Roeck kirjoitti:
Quoted 34 lines
Ensure that
early_printk()does not write into VGA memory space if there is not VGA device in the system.Signed-off-by Guenter Roeck <[email protected]>---
v3:
Changes are now limited toearly_printk.c. Functionality is retained, meaning there will still be output on the VGA console beforesetup_early_printk()is called, but only if a VGA device is known to exist in the system.arch/x86/kernel/early_printk.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)arch/x86/kernel/early_printk.c +7
-4@@ -170,10 +170,13 @@ asmlinkage void early_printk(const char *fmt, ...) int n; va_list ap; - va_start(ap, fmt); - n = vscnprintf(buf, sizeof(buf), fmt, ap); - early_console->write(early_console, buf, n); - va_end(ap); + if (early_console && (early_console_initialized || + boot_params.screen_info.orig_video_isVGA == 1)) { + va_start(ap, fmt); + n = vscnprintf(buf, sizeof(buf), fmt, ap); + early_console->write(early_console, buf, n); + va_end(ap); + } }Quoted 14 lines
arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 243
Quoted 10 lines
arch/x86/kernel/early_printk.c +5
-0static inline void early_console_register(struct console *con, int keep_early)@@ -233,6 +236,12 @@ static int __init setup_early_printk(char *buf) #endif buf++; } + + /* If there is no VGA device, don't try to use it as early console. */ + if (early_console == &early_vga_console && + boot_params.screen_info.orig_video_isVGA != 1) + early_console = NULL;Wouldn't it be better to switch to, say, serial console here to avoid the NULL check in
early_printk()?This would be another possibility.
However, since the serial console was not explicitly selected, it would possibly not be initialized. My understanding is that Peter had a problem with that.
Quoted 6 lines
One can argue that it would still be better to select the serial console in that case, even though it might not be initialized. Actually, most likely it is (if it exists), since the system must presumably have some means to communicate with the world.
I am pretty much open to either option, if that results in the patch being accepted. Just let me know which way to go.
Peter?
H. Peter Anvin
reviewerQuoted 9 lines · Pekka Enberg
Quoted 9 lines
Quoted 4 lines
Wouldn't it be better to switch to, say, serial console here to avoid the NULL check in
early_printk()?This would be another possibility.
However, since the serial console was not explicitly selected, it would possibly not be initialized. My understanding is that Peter had a problem with that.
Quoted 8 lines
Quoted 6 lines
One can argue that it would still be better to select the serial console in that case, even though it might not be initialized. Actually, most likely it is (if it exists), since the system must presumably have some means to communicate with the world.
I am pretty much open to either option, if that results in the patch being accepted. Just let me know which way to go.
Peter?
Yes, I really don't want to issue bytes to a serial port that isn't known to be initialized; it could take a *very* long time even if the port is actually present, and if the port *isn't* present it could hang the kernel.
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.
Quoted 23 lines · Guenter Roeck
Ensure that
early_printk()does not write into VGA memory space if there is not VGA device in the system.Signed-off-by Guenter Roeck <[email protected]>---
v3:
Changes are now limited toearly_printk.c. Functionality is retained, meaning there will still be output on the VGA console beforesetup_early_printk()is called, but only if a VGA device is known to exist in the system.arch/x86/kernel/early_printk.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)arch/x86/kernel/early_printk.c +0
-2@@ -170,10 +170,13 @@ asmlinkage void early_printk(const char *fmt, ...) int n; va_list ap; - va_start(ap, fmt); - n = vscnprintf(buf, sizeof(buf), fmt, ap);
arch/x86/kernel/early_printk.c asmlinkage void early_printk(const char *fmt, ...) · line 180
Quoted 10 lines
arch/x86/kernel/early_printk.c +7
-2- early_console->write(early_console, buf, n); - va_end(ap); + if (early_console && (early_console_initialized || + boot_params.screen_info.orig_video_isVGA == 1)) { + va_start(ap, fmt); + n = vscnprintf(buf, sizeof(buf), fmt, ap); + early_console->write(early_console, buf, n); + va_end(ap); + } }
Instead to this ugly if why not creating a null early_console (write will do nothing) ?
arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 246
Quoted 13 lines
arch/x86/kernel/early_printk.c +6
-0static inline void early_console_register(struct console *con, int keep_early)@@ -233,6 +236,12 @@ static int __init setup_early_printk(char *buf) #endif buf++; } + + /* If there is no VGA device, don't try to use it as early console. */ + if (early_console == &early_vga_console && + boot_params.screen_info.orig_video_isVGA != 1) + early_console = NULL; + return 0; }
And assign null console as the last console as a fallback ?
Regards
Bastien
Quoted 39 lines · Bastien ROUCARIES
Quoted 23 lines · Guenter Roeck
Ensure that
early_printk()does not write into VGA memory space if there is not VGA device in the system.Signed-off-by Guenter Roeck <[email protected]>---
v3:
Changes are now limited toearly_printk.c. Functionality is retained, meaning there will still be output on the VGA console beforesetup_early_printk()is called, but only if a VGA device is known to exist in the system.arch/x86/kernel/early_printk.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)arch/x86/kernel/early_printk.c +0
-2@@ -170,10 +170,13 @@ asmlinkage void early_printk(const char *fmt, ...) int n; va_list ap; - va_start(ap, fmt); - n = vscnprintf(buf, sizeof(buf), fmt, ap);arch/x86/kernel/early_printk.c asmlinkage void early_printk(const char *fmt, ...) · line 180
Quoted 10 lines
arch/x86/kernel/early_printk.c +7
-2- early_console->write(early_console, buf, n); - va_end(ap); + if (early_console && (early_console_initialized || + boot_params.screen_info.orig_video_isVGA == 1)) { + va_start(ap, fmt); + n = vscnprintf(buf, sizeof(buf), fmt, ap); + early_console->write(early_console, buf, n); + va_end(ap); + } }Instead to this ugly if why not creating a null
early_console(write will do nothing) ?
Quoted 16 lines
arch/x86/kernel/early_printk.c static int __init setup_early_printk(char *buf) · line 246
Quoted 13 lines
arch/x86/kernel/early_printk.c +6
-0static inline void early_console_register(struct console *con, int keep_early)@@ -233,6 +236,12 @@ static int __init setup_early_printk(char *buf) #endif buf++; } + + /* If there is no VGA device, don't try to use it as early console. */ + if (early_console == &early_vga_console && + boot_params.screen_info.orig_video_isVGA != 1) + early_console = NULL; + return 0; }And assign null console as the last console as a fallback ?
Sounds good to me. Peter, would that get your approval ?
Guenter