console: Don't perform test for CON_BRL flag twice
PATCH v2 1/5 console: Don't perform test for CON_BRL flag twice
The braille_unregister_console() already tests for console to have CON_BRL flag. No need to repeat this in _braille_unregister_console().
However, we need to check for that flag at the beginning of the function to avoid any regressions in the callers.
---
v2: new patch
drivers/accessibility/braille/braille_console.c | 4 ++-- kernel/printk/braille.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/accessibility/braille/braille_console.c +2 -2
@@ -369,10 +369,10 @@ int braille_register_console(struct console *console, int index,int braille_unregister_console (struct console *console) { -if (braille_co != console) -return -EINVAL ;if (!(console->flags &CON_BRL ))return 0 ; +if (braille_co != console) +return -EINVAL ;unregister_keyboard_notifier (&keyboard_notifier_block);unregister_vt_notifier (&vt_notifier_block); braille_co =NULL ;
kernel/printk/braille.c +1 -4
@@ -51,8 +51,5 @@ _braille_register_console(struct console *console, struct console_cmdline *c)int _braille_unregister_console (struct console *console) { -if (console->flags &CON_BRL ) -return braille_unregister_console (console); - -return 0 ; +return braille_unregister_console (console); }
Signature · 1 line
2.24.1
PATCH v2 2/5 console: Drop double check for console_drivers being non-NULL
There is no need to explicitly check for console_drivers to be non-NULL since for_each_console() does this.
---
v2: mark it as a console patch in the Subject line
kernel/printk/printk.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
kernel/printk/printk.c +6 -10
@@ -1772,9 +1772,6 @@ static void call_console_drivers(const char *ext_text, size_t ext_len,trace_console_rcuidle (text, len); -if (!console_drivers) -return ; -for_each_console (con) {if (exclusive_console && con != exclusive_console)continue ;
@@ -2653,18 +2650,17 @@ void register_console(struct console *newcon)struct console_cmdline *c;static bool has_preferred; -if (console_drivers) -for_each_console (bcon) -if (WARN (bcon == newcon, -"console '%s%d' already registered\n" , - bcon->name, bcon->index)) -return ; +for_each_console (bcon) { +if (WARN (bcon == newcon,"console '%s%d' already registered\n" , + bcon->name, bcon->index)) +return ; + }/* * before we register a new CON_BOOT console, make sure we don't * already have a valid console */ -if (console_drivers && newcon->flags &CON_BOOT ) { +if (newcon->flags &CON_BOOT ) {/* find the last or real console */ for_each_console (bcon) {if (!(bcon->flags &CON_BOOT )) {
Signature · 1 line
2.24.1
PATCH v2 3/5 console: Use for_each_console() helper in unregister_console()
In reply to Andy ShevchenkoWe have rather open coded single linked list manipulations where we may simple use for_each_console() helper with properly set exit conditions.
Replace open coded single-linked list handling with for_each_console() helper in use.
---
v2: new patch
kernel/printk/printk.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
kernel/printk/printk.c +5 -6
@@ -2809,7 +2809,7 @@ EXPORT_SYMBOL(register_console);int unregister_console (struct console *console) { -struct console *a, *b; +struct console *con;int res; pr_info("%sconsole [%s%d] disabled\n",
@@ -2825,11 +2825,10 @@ int unregister_console(struct console *console)if (console_drivers == console) { console_drivers=console->next; res =0 ; - }else if (console_drivers) { -for (a=console_drivers->next, b=console_drivers ; - a; b=a, a=b->next) { -if (a == console) { - b->next = a->next; + }else { +for_each_console (con) { +if (con->next == console) { + con->next = console->next; res =0 ;break ; }
Signature · 1 line
2.24.1
PATCH v2 4/5 console: Avoid positive return code from unregister_console()
In reply to Andy ShevchenkoThere are two callers which use the returned code from unregister_console(). In some cases, i.e. successfully unregistered Braille console or when console has not been enabled the return code is 1. This code is ambiguous and also prevents callers to distinguish successful operation.
Replace this logic to return only negative error codes or 0 when console, either enabled, disabled or Braille has been successfully unregistered.
---
v2: new patch
kernel/printk/printk.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
kernel/printk/printk.c +7 -2
@@ -2817,10 +2817,12 @@ int unregister_console(struct console *console) console->name, console->index); res =_braille_unregister_console (console); -if (res) +if (res <0 )return res; +if (res >0 ) +return 0 ; - res =1 ; + res = -ENODEV ;console_lock ();if (console_drivers == console) { console_drivers=console->next;
@@ -2838,6 +2840,9 @@ int unregister_console(struct console *console)if (!res && (console->flags &CON_EXTENDED )) nr_ext_console_drivers--; +if (res && !(console->flags &CON_ENABLED )) + res =0 ; +/* * If this isn't the last console and it has CON_CONSDEV set, we * need to set it on the next preferred console.
Signature · 1 line
2.24.1
PATCH v2 5/5 console: Introduce ->exit() callback
In reply to Andy ShevchenkoSome consoles might require special operations on unregistering. For example, serial console, when registered in the kernel, keeps power on for entire time, until it gets unregistered. For such cases to have a balance we would provide ->exit() callback.
---
v2: new patch
include/linux/console.h | 1 + kernel/printk/printk.c | 3 +++ 2 files changed, 4 insertions(+)
include/linux/console.h +1 -0
@@ -148,6 +148,7 @@ struct console {struct tty_driver *(*device)(struct console *,int *);void (*unblank)(void );int (*setup)(struct console *,char *); +void (*exit)(struct console *);int (*match)(struct console *,char *name,int idx,char *options);short flags;short index;
kernel/printk/printk.c +3 -0
@@ -2850,6 +2850,9 @@ int unregister_console(struct console *console)if (console_drivers !=NULL && console->flags &CON_CONSDEV ) console_drivers->flags |=CON_CONSDEV ; +if (console->exit) + console->exit (console); + console->flags &= ~CON_ENABLED ;console_unlock ();console_sysfs_notify ();
Signature · 1 line
2.24.1
Re: [PATCH v2 5/5] console: Introduce ->exit() callback
On (20/01/24 17:57), Andy Shevchenko wrote:
[..]
Quoted 14 lines
+++
b/include/linux/console.hinclude/linux/console.h +1
-0@@ -148,6 +148,7 @@ struct console {struct tty_driver *(*device)(struct console *,int *);void (*unblank)(void );int (*setup)(struct console *,char *); +void (*exit)(struct console *);int (*match)(struct console *,char *name,int idx,char *options);short flags;short index;kernel/printk/printk.c +0
-0
kernel/printk/printk.c int unregister_console(struct console *console) · line 2858
Quoted 9 lines
kernel/printk/printk.c +3
-0@@ -2850,6 +2850,9 @@ int unregister_console(struct console *console)if (console_drivers !=NULL && console->flags &CON_CONSDEV ) console_drivers->flags |=CON_CONSDEV ; +if (console->exit) + console->exit (console); + console->flags &= ~CON_ENABLED ;console_unlock ();console_sysfs_notify ();
Do you need to call ->exit() under console_lock?
-ss
Re: [PATCH v2 5/5] console: Introduce ->exit() callback
Quoted 19 lines · Sergey Senozhatsky
On (20/01/24 17:57), Andy Shevchenko wrote:
[..]Quoted 17 lines
+++
b/include/linux/console.hinclude/linux/console.h +1
-0@@ -148,6 +148,7 @@ struct console {struct tty_driver *(*device)(struct console *,int *);void (*unblank)(void );int (*setup)(struct console *,char *); +void (*exit)(struct console *);int (*match)(struct console *,char *name,int idx,char *options);short flags;short index;kernel/printk/printk.c +0
-0@@ -2850,6 +2850,9 @@ int unregister_console(struct console *console)if (console_drivers !=NULL && console->flags &CON_CONSDEV ) console_drivers->flags |=CON_CONSDEV ;
Quoted 8 lines
kernel/printk/printk.c int unregister_console(struct console *console) · line 2858
Quoted 6 lines
kernel/printk/printk.c +3
-0+if (console->exit) + console->exit (console); + console->flags &= ~CON_ENABLED ;console_unlock ();console_sysfs_notify ();Do you need to call ->exit() under
console_lock?
I think we don't need that lock to be held.
Signature · 2 lines
With Best Regards, Andy Shevchenko
On (20/01/24 17:57), Andy Shevchenko wrote:
[..]
Quoted 19 lines
+++
b/drivers/accessibility/braille/braille_console.cdrivers/accessibility/braille/braille_console.c +2
-2@@ -369,10 +369,10 @@ int braille_register_console(struct console *console, int index,int braille_unregister_console (struct console *console) { -if (braille_co != console) -return -EINVAL ;if (!(console->flags &CON_BRL ))return 0 ; +if (braille_co != console) +return -EINVAL ;unregister_keyboard_notifier (&keyboard_notifier_block);unregister_vt_notifier (&vt_notifier_block); braille_co =NULL ;kernel/printk/braille.c +0
-0
kernel/printk/braille.c _braille_register_console(struct console *console, struct console_cmdline *c) · line 55
Quoted 9 lines
kernel/printk/braille.c +1
-4@@ -51,8 +51,5 @@ _braille_register_console(struct console *console, struct console_cmdline *c)int _braille_unregister_console (struct console *console) { -if (console->flags &CON_BRL ) -return braille_unregister_console (console); - -return 0 ; +return braille_unregister_console (console); }
Hmm, I don't know. This moves sort of important code from common upper layer down to particular driver implementation. Should there be another driver/super-braille.c it must test CON_BRL flag as well. Because printk invokes _braille_unregister_console() unconditionally, and _braille_unregister_console() unconditionally calls into the driver.
I guess we can remove CON_BRL from braille_unregister_console() instead, because printk tests it.
-ss
Quoted 37 lines · Sergey Senozhatsky
On (20/01/24 17:57), Andy Shevchenko wrote:
[..]Quoted 19 lines
+++
b/drivers/accessibility/braille/braille_console.cdrivers/accessibility/braille/braille_console.c +2
-2@@ -369,10 +369,10 @@ int braille_register_console(struct console *console, int index,int braille_unregister_console (struct console *console) { -if (braille_co != console) -return -EINVAL ;if (!(console->flags &CON_BRL ))return 0 ; +if (braille_co != console) +return -EINVAL ;unregister_keyboard_notifier (&keyboard_notifier_block);unregister_vt_notifier (&vt_notifier_block); braille_co =NULL ;kernel/printk/braille.c +0
-0kernel/printk/braille.c _braille_register_console(struct console *console, struct console_cmdline *c) · line 55
Quoted 9 lines
kernel/printk/braille.c +1
-4@@ -51,8 +51,5 @@ _braille_register_console(struct console *console, struct console_cmdline *c)int _braille_unregister_console (struct console *console) { -if (console->flags &CON_BRL ) -return braille_unregister_console (console); - -return 0 ; +return braille_unregister_console (console); }Hmm, I don't know. This moves sort of important code from common upper layer down to particular driver implementation. Should there be another
driver/super-braille.cit must testCON_BRLflag as well. Because printk invokes_braille_unregister_console()unconditionally, and_braille_unregister_console()unconditionally calls into the driver.
Quoted 2 lines
I guess we can remove
CON_BRLfrombraille_unregister_console()instead, because printk tests it.
Let me do that way, thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko