Skip to contentSkip to conversation

Do not output logo on quiet boots

PATCH In review Prarit Bhargava 3 participants 8 messages Jan 29, 2019 – May 6, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v5 cover Do not output logo on quiet boots

On text-based systems the 'quiet' boot option will show printk levels higher than CONSOLE_LOGLEVEL_QUIET. The displaying of the Tux logo during boot can cause some consoles to lose display data and as a result confuse the end user.

Do not display the Tux logo on systems that are in 'quiet' boot.

v2: It helps to commit all my changes before sending them. Remove extra bracket.
v3: buildbot error fix: fbcon can be built as part of a module so export console_printk
v4: move console_printk change to separate patch, and drop logo cleanup
v5: Only set FBCON_LOGO_DONTSHOW for console loglevel

Cc Hans de Goede <[email protected]>
Cc Marko Myllynen <[email protected]>
Cc Steven Rostedt (VMware) <[email protected]>
Cc Bartlomiej Zolnierkiewicz <[email protected]>
Cc Kees Cook <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Yisheng Xie <[email protected]>
Cc Petr Mladek <[email protected]>
Cc Sergey Senozhatsky <[email protected]>

Prarit Bhargava (2):
printk: Export console_printk
fbcon: Silence fbcon logo on 'quiet' boots

 drivers/video/fbdev/core/fbcon.c | 8 +++++++-
 kernel/printk/printk.c           | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.2
#1 lore raw

PATCH v5 2/2 fbcon: Silence fbcon logo on 'quiet' boots

On text-based systems the 'quiet' boot option will show printk levels higher than CONSOLE_LOGLEVEL_QUIET. The displaying of the Tux logo during boot can cause some consoles to lose display data and as a result confuse the end user.

Do not display the Tux logo on systems that are in 'quiet' boot.

v2: It helps to commit all my changes before sending them. Remove extra bracket.
v3: buildbot error fix: fbcon can be built as part of a module so export console_printk
v4: move console_printk change to separate patch, and drop logo cleanup
v5: Only set FBCON_LOGO_DONTSHOW for console loglevel

Cc Hans de Goede <[email protected]>
Cc Marko Myllynen <[email protected]>
Cc Steven Rostedt (VMware) <[email protected]>
Cc Bartlomiej Zolnierkiewicz <[email protected]>
Cc Kees Cook <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Yisheng Xie <[email protected]>
---
 drivers/video/fbdev/core/fbcon.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/video/fbdev/core/fbcon.c +7 -1
index bfa1360ec750..59b626356983 100644
@@ -656,11 +656,14 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
 		kfree(save);
 	}
 
+	if (logo_shown = FBCON_LOGO_DONTSHOW)
+		return;
+
 	if (logo_lines > vc->vc_bottom) {
 		logo_shown = FBCON_LOGO_CANSHOW;
 		printk(KERN_INFO
 		       "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
-	} else if (logo_shown != FBCON_LOGO_DONTSHOW) {
+	} else {
 		logo_shown = FBCON_LOGO_DRAW;
 		vc->vc_top = logo_lines;
 	}
@@ -1066,6 +1069,9 @@ static void fbcon_init(struct vc_data *vc, int init)
 
 	cap = info->flags;
 
+	if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
+		logo_shown = FBCON_LOGO_DONTSHOW;
+
 	if (vc != svc || logo_shown = FBCON_LOGO_DONTSHOW ||
 	    (info->fix.type = FB_TYPE_TEXT))
 		logo = 0;
Signature · 1 line
2.17.2
#2 lore raw

Re: [PATCH v5 2/2] fbcon: Silence fbcon logo on 'quiet' boots

drivers/video/fbdev/core/fbcon.c static void fbcon_init(struct vc_data *vc, int init) · line 1077

Quoted 10 lines · Prarit Bhargava
drivers/video/fbdev/core/fbcon.c +3 -0
@@ -1066,6 +1069,9 @@ static void fbcon_init(struct vc_data *vc, int init)
 
 	cap = info->flags;
 
+	if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
+		logo_shown = FBCON_LOGO_DONTSHOW;
+
 	if (vc != svc || logo_shown = FBCON_LOGO_DONTSHOW ||
 	    (info->fix.type = FB_TYPE_TEXT))
 		logo = 0;

This causes the scroll region to no longer be reset when the logo is removed.

Andreas.

Signature · 3 lines
Andreas Schwab, [email protected]
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."
#3 lore raw

Re: [PATCH v5 2/2] fbcon: Silence fbcon logo on 'quiet' boots

Quoted 6 lines · Andreas Schwab
Quoted 4 lines · Prarit Bhargava
drivers/video/fbdev/core/fbcon.c +0 -0
@@ -1066,6 +1069,9 @@ static void fbcon_init(struct vc_data *vc, int init)
 
 	cap = info->flags;
 
Quoted 10 lines

drivers/video/fbdev/core/fbcon.c static void fbcon_init(struct vc_data *vc, int init) · line 1077

Quoted 6 lines
drivers/video/fbdev/core/fbcon.c +3 -0
+	if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
+		logo_shown = FBCON_LOGO_DONTSHOW;
+
 	if (vc != svc || logo_shown = FBCON_LOGO_DONTSHOW ||
 	    (info->fix.type = FB_TYPE_TEXT))
 		logo = 0;

This causes the scroll region to no longer be reset when the logo is removed.

Andreas, my apologies but I'm not sure what you mean. Could you elaborate on the broken and expected behaviour?

I'm absolutely not disputing that there's a bug.

Thanks,

P.

Quoted 2 lines

Andreas.

#4 lore raw

Re: [PATCH v5 2/2] fbcon: Silence fbcon logo on 'quiet' boots

Quoted 18 lines · Prarit Bhargava
Quoted 6 lines · Andreas Schwab
Quoted 4 lines · Prarit Bhargava
drivers/video/fbdev/core/fbcon.c +0 -0
@@ -1066,6 +1069,9 @@ static void fbcon_init(struct vc_data *vc, int init)
 
 	cap = info->flags;
 
Quoted 10 lines

drivers/video/fbdev/core/fbcon.c static void fbcon_init(struct vc_data *vc, int init) · line 1077

Quoted 6 lines
drivers/video/fbdev/core/fbcon.c +3 -0
+	if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
+		logo_shown = FBCON_LOGO_DONTSHOW;
+
 	if (vc != svc || logo_shown = FBCON_LOGO_DONTSHOW ||
 	    (info->fix.type = FB_TYPE_TEXT))
 		logo = 0;

This causes the scroll region to no longer be reset when the logo is removed.

Quoted 2 lines

Andreas, my apologies but I'm not sure what you mean. Could you elaborate on the broken and expected behaviour?

If fbcon_init is called after the loglevel is reduced to CONSOLE_LOGLEVEL_QUIET, the logo is not drawn, but the scrolling region remains.

Andreas.

Signature · 3 lines
Andreas Schwab, [email protected]
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."
#5 lore raw

PATCH 1/1 fbcon: Don't reset logo_shown when logo is currently shown

In reply to Prarit Bhargava

When the logo is currently drawn on a virtual console, and the console loglevel is reduced to quiet, logo_shown must be left alone, so that it the scrolling region on that virtual console is properly reset.

Fixes 10993504d647 ("fbcon: Silence fbcon logo on 'quiet' boots")

---

Quoted 18 lines · Prarit Bhargava
Quoted 6 lines · Andreas Schwab
Quoted 4 lines · Prarit Bhargava
(quoted diff) +0 -0
@@ -1066,6 +1069,9 @@ static void fbcon_init(struct vc_data *vc, int init)
 
 	cap = info->flags;
 
Quoted 10 lines

Review static void fbcon_init(struct vc_data *vc, int init) · line 1077

Quoted 6 lines
(quoted diff) +3 -0
+	if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
+		logo_shown = FBCON_LOGO_DONTSHOW;
+
 	if (vc != svc || logo_shown = FBCON_LOGO_DONTSHOW ||
 	    (info->fix.type = FB_TYPE_TEXT))
 		logo = 0;

This causes the scroll region to no longer be reset when the logo is removed.

Quoted 2 lines

Andreas, my apologies but I'm not sure what you mean. Could you elaborate on the broken and expected behaviour?

[    3.204286] fbcon_init: logo_shown = -1, console_loglevel = 7
[   11.840899] fbcon_init: logo_shown = 0, console_loglevel = 1
[   35.344877] fbcon_init: logo_shown = -3, console_loglevel = 1
[   35.345274] fbcon_init: logo_shown = -3, console_loglevel = 1
[   35.345622] fbcon_init: logo_shown = -3, console_loglevel = 1
[   35.345974] fbcon_init: logo_shown = -3, console_loglevel = 1
[   35.346375] fbcon_init: logo_shown = -3, console_loglevel = 1

logo_shown must not be reset when non-negative.

Andreas.

---
 drivers/video/fbdev/core/fbcon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/core/fbcon.c +1 -1
index cd059a801662..786f9aab55df 100644
@@ -1069,7 +1069,7 @@ static void fbcon_init(struct vc_data *vc, int init)
 
 	cap = info->flags;
 
-	if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
+	if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
 		logo_shown = FBCON_LOGO_DONTSHOW;
 
 	if (vc != svc || logo_shown = FBCON_LOGO_DONTSHOW ||
Signature · 6 lines
2.21.0

-- 
Andreas Schwab, [email protected]
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."
#6 lore raw

Re: [PATCH] fbcon: Don't reset logo_shown when logo is currently shown

Quoted 6 lines · Andreas Schwab

When the logo is currently drawn on a virtual console, and the console loglevel is reduced to quiet, logo_shown must be left alone, so that it the scrolling region on that virtual console is properly reset.

Fixes 10993504d647 ("fbcon: Silence fbcon logo on 'quiet' boots")

Patch queued for v5.2, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

#7 lore raw
In reply to Prarit Bhargava
Quoted 7 lines · Prarit Bhargava

On text-based systems the 'quiet' boot option will show printk levels higher than CONSOLE_LOGLEVEL_QUIET. The displaying of the Tux logo during boot can cause some consoles to lose display data and as a result confuse the end user.

Do not display the Tux logo on systems that are in 'quiet' boot.

Quoted 8 lines

v2: It helps to commit all my changes before sending them. Remove extra bracket.
v3: buildbot error fix: fbcon can be built as part of a module so export console_printk
v4: move console_printk change to separate patch, and drop logo cleanup
v5: Only set FBCON_LOGO_DONTSHOW for console loglevel

Patches #1-2 queued for v5.1, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics