Fixes for console command line ordering
Subsystems (2)
v3 cover Fixes for console command line ordering
Hi,
Recent changes to add support for DEVNAME:0.0 style consoles caused a regression with the preferred console order where the last console on the kernel command line is no longer the preferred console.
The following three changes fix the issue using Petr's suggestion that does not involve calling __add_preferred_console() later on again, and adds the deferred consoles to the console_cmdline[] directly to be updated when the console is ready.
We revert the earlier printk related changes, and then add back the DEVNAME:0.0 functionality based on Petr's code snippet. And we end up reducing the code quite a bit too this way.
The reason we want DEVNAME:0.0 style consoles is it helps addressing the console based on the connected serial port controller device rather than using the hardcoded ttyS addressing. And that helps with issues related to the console moving around after togging the HSUART option in the BIOS, or when new ports are enabled in devicetree and aliases are not updated.
Regards,
Tony
Changes since v2:
- Use match_devname_and_update_preferred_console() naming and update the comments
- Add a patch to rename the serial functions to use match and update naming
- Use ttyname instad of chardev in console_setup()
- Split variables per-line in console_setup()
- Initialize idx to -1 for devname in console_setup()
- Add pr_info() statement when a preferred console is associated with a devname
Changes since v1:
- Revert the problem causing printk changes and switch to using the solution based on Petr's suggestion and code snippet
Tony Lindgren (3):
printk: Revert add_preferred_console_match() related commits
printk: Add match_devname_and_update_preferred_console()
serial: core: Rename preferred console handling for match and update
drivers/tty/serial/8250/8250_core.c | 4 +- drivers/tty/serial/serial_base.h | 4 +- drivers/tty/serial/serial_base_bus.c | 23 +++-- include/linux/printk.h | 5 +- kernel/printk/Makefile | 2 +- kernel/printk/conopt.c | 146 --------------------------- kernel/printk/console_cmdline.h | 7 +- kernel/printk/printk.c | 122 ++++++++++++++++------ 8 files changed, 111 insertions(+), 202 deletions(-) delete mode 100644 kernel/printk/conopt.c
base-commit: 6ba59ff4227927d3a8530fc2973b80e94b54d58f
Signature · 1 line
2.45.2
PATCH v3 1/3 printk: Revert add_preferred_console_match() related commits
Recent changes to allow using DEVNAME:0.0 style console names caused a regression to the kernel command line handling for the console options.
The last preferred console added gets used for init. This is documented in the comments for add_preferred_console(). Now the kernel command line options for console=ttyS0,115200 console=tty0 are wrongly handled and cause the /dev/console to be associated with ttyS0 instead of tty0.
This happens because we are calling __add_preferred_console() later on from serial8250_isa_init_ports() after console_setup() and the console gets treated as the last added preferred console. As the DEVNAME:0.0 style console device is not known at console_setup() time, I added a call to __add_preferred_console() later on when the console is ready.
To fix the issue, let's revert the printk related commits:
f03e8c1060f8 ("printk: Save console options for add_preferred_console_match()") b73c9cbe4f1f ("printk: Flag register_console() if console is set on command line") 8a831c584e6e ("printk: Don't try to parse DEVNAME:0.0 console options")
We need to also drop the call for add_preferred_console_match() from serial_base_add_one_prefcon() added by commit 787a1cabac01 ("serial: core:
Add support for DEVNAME:0.0 style naming for kernel console").
Petr has suggested a better way to handle the deferred consoles that does not rely on calling __add_preferred_console() again.
--- drivers/tty/serial/serial_base_bus.c | 8 +- include/linux/printk.h | 3 - kernel/printk/Makefile | 2 +- kernel/printk/conopt.c | 146 --------------------------- kernel/printk/console_cmdline.h | 6 -- kernel/printk/printk.c | 23 +---- 6 files changed, 6 insertions(+), 182 deletions(-) delete mode 100644 kernel/printk/conopt.c
drivers/tty/serial/serial_base_bus.c +1 -7
@@ -210,13 +210,7 @@ void serial_base_port_device_remove(struct serial_port_device *port_dev)static int serial_base_add_one_prefcon (const char *match,const char *dev_name,int port_id) { -int ret; - - ret =add_preferred_console_match (match, dev_name, port_id); -if (ret == -ENOENT ) -return 0 ; - -return ret; +return 0 ; }#ifdef __sparc__
include/linux/printk.h +0 -3
@@ -60,9 +60,6 @@ static inline const char *printk_skip_headers(const char *buffer)#define CONSOLE_LOGLEVEL_DEFAULT CONFIG_CONSOLE_LOGLEVEL_DEFAULT#define CONSOLE_LOGLEVEL_QUIET CONFIG_CONSOLE_LOGLEVEL_QUIET -int add_preferred_console_match (const char *match,const char *name, -const short idx); -extern int console_printk[];#define console_loglevel (console_printk[0])
kernel/printk/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y = printk.o conopt.o +obj-y = printk.o obj-$(CONFIG_PRINTK) += printk_safe.o nbcon.o obj-$(CONFIG_A11Y_BRAILLE_CONSOLE) += braille.o obj-$(CONFIG_PRINTK_INDEX) += index.o
kernel/printk/conopt.c deleted +0 -146
146 lines not on this page · raw message
kernel/printk/console_cmdline.h +0 -6
@@ -2,12 +2,6 @@ #ifndef _CONSOLE_CMDLINE_H #define _CONSOLE_CMDLINE_H -#define MAX_CMDLINECONSOLES 8 - -int console_opt_save(const char *str, const char *brl_opt); -int console_opt_add_preferred_console(const char *name, const short idx, - char *options, char *brl_options); - struct console_cmdline { char name[16]; /* Name of the driver */
kernel/printk/printk.c +4 -19
@@ -383,6 +383,9 @@ static int console_locked;/* * Array of consoles built from command line options (console=) */ + +#define MAX_CMDLINECONSOLES 8 +static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES ];static int preferred_console =-1 ;
@@ -2500,17 +2503,6 @@ static int __init console_setup(char *str)if (_braille_console_setup (&str, &brl_options))return 1 ; -/* Save the console for driver subsystem use */ -if (console_opt_save (str, brl_options)) -return 1 ; - -/* Flag register_console() to not call try_enable_default_console() */ - console_set_on_cmdline =1 ; - -/* Don't attempt to parse a DEVNAME:0.0 style console */ -if (strchr (str,':' )) -return 1 ; -/* * Decode str into name, index, options. */
@@ -2541,13 +2533,6 @@ static int __init console_setup(char *str) }__setup ("console=" , console_setup); -/* Only called from add_preferred_console_match() */ -int console_opt_add_preferred_console (const char *name,const short idx, -char *options,char *brl_options) -{ -return __add_preferred_console (name, idx, options, brl_options, true); -} -/** * add_preferred_console - add a device to the list of preferred consoles. * @name: device name
@@ -3522,7 +3507,7 @@ void register_console(struct console *newcon)* Note that a console with tty binding will have CON_CONSDEV * flag set and will be first in the list. */ -if (preferred_console <0 && !console_set_on_cmdline) { +if (preferred_console <0 ) {if (hlist_empty (&console_list) || !console_first ()->device ||console_first ()->flags &CON_BOOT ) {try_enable_default_console (newcon);
Signature · 1 line
2.45.2
PATCH v3 2/3 printk: Add match_devname_and_update_preferred_console()
In reply to Tony LindgrenLet's add match_devname_and_update_preferred_console() for driver subsystems to call during init when the console is ready, and it's character device name is known. For now, we use it only for the serial layer to allow console=DEVNAME:0.0 style hardware based addressing for consoles.
The earlier attempt on doing this caused a regression with the kernel command line console order as it added calling __add_preferred_console() again later on during init. A better approach was suggested by Petr where we add the deferred console to the console_cmdline[] and update it later on when the console is ready.
--- drivers/tty/serial/serial_base_bus.c | 8 ++- include/linux/printk.h | 4 ++ kernel/printk/console_cmdline.h | 1 + kernel/printk/printk.c | 103 +++++++++++++++++++++++---- 4 files changed, 100 insertions(+), 16 deletions(-)
drivers/tty/serial/serial_base_bus.c +7 -1
@@ -210,7 +210,13 @@ void serial_base_port_device_remove(struct serial_port_device *port_dev)static int serial_base_add_one_prefcon (const char *match,const char *dev_name,int port_id) { -return 0 ; +int ret; + + ret =match_devname_and_update_preferred_console (match, dev_name, port_id); +if (ret == -ENOENT ) +return 0 ; + +return ret; }#ifdef __sparc__
include/linux/printk.h +4 -0
@@ -60,6 +60,10 @@ static inline const char *printk_skip_headers(const char *buffer)#define CONSOLE_LOGLEVEL_DEFAULT CONFIG_CONSOLE_LOGLEVEL_DEFAULT#define CONSOLE_LOGLEVEL_QUIET CONFIG_CONSOLE_LOGLEVEL_QUIET +int match_devname_and_update_preferred_console (const char *match, +const char *name, +const short idx); +extern int console_printk[];#define console_loglevel (console_printk[0])
kernel/printk/console_cmdline.h +1 -0
@@ -6,6 +6,7 @@ struct console_cmdline {char name[16 ];/* Name of the driver */ int index;/* Minor dev. to use */ +char devname[32 ];/* DEVNAME:0.0 style device name */ bool user_specified;/* Specified by command line vs. platform */ char *options;/* Options for the driver */ #ifdef CONFIG_A11Y_BRAILLE_CONSOLE
kernel/printk/printk.c +88 -15
174 lines not on this page · raw message
Signature · 1 line
2.45.2
PATCH v3 3/3 serial: core: Rename preferred console handling for match and update
In reply to Tony LindgrenWe are now matching and updating the preferred console, not adding it. Let's update the naming accordingly to avoid confusion.
--- drivers/tty/serial/8250/8250_core.c | 4 ++-- drivers/tty/serial/serial_base.h | 4 ++-- drivers/tty/serial/serial_base_bus.c | 21 +++++++++++---------- 3 files changed, 15 insertions(+), 14 deletions(-)
drivers/tty/serial/8250/8250_core.c +2 -2
@@ -42,7 +42,7 @@#include <asm/irq.h> -#include "../serial_base.h" /* For serial_base_add_isa_preferred_console() */ +#include "../serial_base.h" /* For serial_base_match_and_update_isa_preferred_console() */ #include "8250.h"
@@ -564,7 +564,7 @@ static void __init serial8250_isa_init_ports(void)if (serial8250_isa_config !=NULL )serial8250_isa_config (i, &up->port, &up->capabilities); -serial_base_add_isa_preferred_console (serial8250_reg.dev_name, i); +serial_base_match_and_update_isa_preferred_console (serial8250_reg.dev_name, i); } }
drivers/tty/serial/serial_base.h +2 -2
@@ -68,12 +68,12 @@ int serial_base_add_preferred_console(struct uart_driver *drv,#ifdef CONFIG_SERIAL_8250_CONSOLE -int serial_base_add_isa_preferred_console (const char *name,int idx); +int serial_base_match_and_update_isa_preferred_console (const char *name,int idx);#else static inline -int serial_base_add_isa_preferred_console (const char *name,int idx) +int serial_base_match_and_update_isa_preferred_console (const char *name,int idx) {return 0 ; }
drivers/tty/serial/serial_base_bus.c +11 -10
@@ -207,8 +207,9 @@ void serial_base_port_device_remove(struct serial_port_device *port_dev)#ifdef CONFIG_SERIAL_CORE_CONSOLE -static int serial_base_add_one_prefcon (const char *match,const char *dev_name, -int port_id) +static int serial_base_match_and_update_one_prefcon (const char *match, +const char *dev_name, +int port_id) {int ret;
@@ -237,7 +238,7 @@ static int serial_base_add_sparc_console(const char *dev_name, int idx) return 0; } -return serial_base_add_one_prefcon (name, dev_name, idx); +return serial_base_match_and_update_one_prefcon (name, dev_name, idx); }#else
@@ -249,7 +250,7 @@ static inline int serial_base_add_sparc_console(const char *dev_name, int idx)#endif -static int serial_base_add_prefcon (const char *name,int idx) +static int serial_base_match_and_update_prefcon (const char *name,int idx) { const char *char_match __free(kfree) = NULL; const char *nmbr_match __free(kfree) = NULL;
@@ -262,7 +263,7 @@ static int serial_base_add_prefcon(const char *name, int idx)if (!nmbr_match)return -ENODEV ; - ret =serial_base_add_one_prefcon (nmbr_match, name, idx); + ret =serial_base_match_and_update_one_prefcon (nmbr_match, name, idx);if (ret)return ret;
@@ -277,7 +278,7 @@ static int serial_base_add_prefcon(const char *name, int idx)if (!char_match)return -ENOMEM ; -return serial_base_add_one_prefcon (char_match, name, idx); +return serial_base_match_and_update_one_prefcon (char_match, name, idx); }/**
@@ -304,7 +305,7 @@ int serial_base_add_preferred_console(struct uart_driver *drv, const char *port_match __free(kfree) = NULL;int ret; - ret =serial_base_add_prefcon (drv->dev_name, port->line); + ret =serial_base_match_and_update_prefcon (drv->dev_name, port->line);if (ret)return ret;
@@ -314,7 +315,7 @@ int serial_base_add_preferred_console(struct uart_driver *drv,return -ENOMEM ;/* Translate a hardware addressing style console=DEVNAME:0.0 */ - return serial_base_add_one_prefcon(port_match, drv->dev_name, port->line); + return serial_base_match_and_update_one_prefcon(port_match, drv->dev_name, port->line); }#endif
@@ -326,9 +327,9 @@ int serial_base_add_preferred_console(struct uart_driver *drv,* This should be only called from serial8250_isa_init_preferred_console(), * other callers are likely wrong and should rely on earlycon instead. */ -int serial_base_add_isa_preferred_console (const char *name,int idx) +int serial_base_match_and_update_isa_preferred_console (const char *name,int idx) { -return serial_base_add_prefcon (name, idx); +return serial_base_match_and_update_prefcon (name, idx); }#endif
Signature · 1 line
2.45.2
Re: [PATCH v3 3/3] serial: core: Rename preferred console handling for match and update
Quoted 5 lines · Tony Lindgren
We are now matching and updating the preferred console, not adding it. Let's update the naming accordingly to avoid confusion.
Suggested-by Petr Mladek <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Re: [PATCH v3 2/3] printk: Add match_devname_and_update_preferred_console()
In reply to Tony LindgrenQuoted 12 lines · Tony Lindgren
Let's add
match_devname_and_update_preferred_console()for driver subsystems to call during init when the console is ready, and it's character device name is known. For now, we use it only for the serial layer to allow console=DEVNAME:0.0 style hardware based addressing for consoles.The earlier attempt on doing this caused a regression with the kernel command line console order as it added calling
__add_preferred_console()again later on during init. A better approach was suggested by Petr where we add the deferred console to the console_cmdline[] and update it later on when the console is ready.
Quoted 3 lines
Suggested-by Petr Mladek <[email protected]>Co-developed-by Petr Mladek <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Looks good and fixes the regression:
Best Regards,
Petr
Petr Mladek
maintainerRe: [PATCH v3 3/3] serial: core: Rename preferred console handling for match and update
In reply to Tony Lindgrendrivers/tty/serial/serial_base_bus.c int serial_base_add_preferred_console(struct uart_driver *drv,
Quoted 6 lines · Tony Lindgren
We are now matching and updating the preferred console, not adding it. Let's update the naming accordingly to avoid confusion.
drivers/tty/serial/serial_base_bus.c +0
-0@@ -304,7 +305,7 @@ int serial_base_add_preferred_console(struct uart_driver *drv,
I was curious whether this patch renamed everything. And it seems that it did not rename serial_base_add_preferred_console().
drivers/tty/serial/serial_base_bus.c int serial_base_add_preferred_console(struct uart_driver *drv, · line 311
Quoted 8 lines
drivers/tty/serial/serial_base_bus.c +1
-1const char *port_match __free(kfree) = NULL;int ret; - ret =serial_base_add_prefcon (drv->dev_name, port->line); + ret =serial_base_match_and_update_prefcon (drv->dev_name, port->line);if (ret)return ret;
Honestly, I do not understand what are all these layers for. Especially, serial_base_match_and_update_prefcon() looks suspicious:
static int serial_base_match_and_update_prefcon(const char *name, int idx)
{
const char *char_match __free(kfree) = NULL;
const char *nmbr_match __free(kfree) = NULL;
int ret;
/* Handle ttyS specific options */
if (strstarts(name, "ttyS")) {
/* No name, just a number */
nmbr_match = kasprintf(GFP_KERNEL, "%i", idx);
if (!nmbr_match)
return -ENODEV;
ret = serial_base_match_and_update_one_prefcon(nmbr_match, name, idx);
if (ret)
return ret;
/* Sparc ttya and ttyb */
ret = serial_base_add_sparc_console(name, idx);
if (ret)
return ret;
}
/* Handle the traditional character device name style console=ttyS0 */
char_match = kasprintf(GFP_KERNEL, "%s%i", name, idx);
if (!char_match)
return -ENOMEM;
return serial_base_match_and_update_one_prefcon(char_match, name, idx);
}It seems to try whether c->devname matches a number "X", or "ttySX". It even tries the sparc-specific transformations in serial_base_add_sparc_console()
But this is the original format which does _not_ include ":". It never will be stored in c->devname and will never match.
I think that it has been the case even before this patchset.
I think that we should remove these layers and check just the "DEVNAME:X.Y" format, aka "%s:%d.%d" [*].
[*] It would be nice to use the same printf format "%s:%d.%d"
in both serial_base_device_init() and also in the functions matching the devname to make it clear that these are the same names. Heh, I just guess that these are the same names.
Best Regards,
Petr
Re: [PATCH v3 3/3] serial: core: Rename preferred console handling for match and update
Quoted 10 lines · Petr Mladek
drivers/tty/serial/serial_base_bus.c int serial_base_add_preferred_console(struct uart_driver *drv,
Quoted 6 lines · Tony Lindgren
We are now matching and updating the preferred console, not adding it. Let's update the naming accordingly to avoid confusion.
drivers/tty/serial/serial_base_bus.c +0
-0@@ -304,7 +305,7 @@ int serial_base_add_preferred_console(struct uart_driver *drv,I was curious whether this patch renamed everything. And it seems that it did not rename
serial_base_add_preferred_console().
Oops, will update the naming for that too.
Quoted 43 lines
drivers/tty/serial/serial_base_bus.c int serial_base_add_preferred_console(struct uart_driver *drv, · line 311
Quoted 8 lines
drivers/tty/serial/serial_base_bus.c +1
-1const char *port_match __free(kfree) = NULL;int ret; - ret =serial_base_add_prefcon (drv->dev_name, port->line); + ret =serial_base_match_and_update_prefcon (drv->dev_name, port->line);if (ret)return ret;Honestly, I do not understand what are all these layers for. Especially,
serial_base_match_and_update_prefcon()looks suspicious:static int
serial_base_match_and_update_prefcon(const char *name, int idx){ const char *char_match __free(kfree) = NULL; const char *nmbr_match __free(kfree) = NULL; int ret; /* Handle ttyS specific options */ if (strstarts(name, "ttyS")) { /* No name, just a number */ nmbr_match = kasprintf(GFP_KERNEL, "%i", idx); if (!nmbr_match) return -ENODEV; ret = serial_base_match_and_update_one_prefcon(nmbr_match, name, idx); if (ret) return ret; /* Sparc ttya and ttyb */ ret = serial_base_add_sparc_console(name, idx); if (ret) return ret; } /* Handle the traditional character device name style console=ttyS0 */ char_match = kasprintf(GFP_KERNEL, "%s%i", name, idx); if (!char_match) return -ENOMEM; return serial_base_match_and_update_one_prefcon(char_match, name, idx); }
Quoted 6 lines
It seems to try whether
c->devnamematches a number "X", or "ttySX". It even tries the sparc-specific transformations inserial_base_add_sparc_console()But this is the original format which does _not_ include ":". It never will be stored in
c->devnameand will never match.
Good catch, this won't do anything now with console_setup() checking for ":" for deferred consoles. So we should revert commit a0f32e2dd998 ("serial: core: Handle serial console options").
Quoted 1 line
I think that it has been the case even before this patchset.
For the earlier case, I tested things with serial handling removed from console_setup() to let the serial layer handle the quirks.
With the new handling, we could just eventually defer the serial consoles in console_setup(), and let the serial core do the quirk handling. No immediate need for that though, that would be just longer term clean-up.
Quoted 2 lines
I think that we should remove these layers and check just the "DEVNAME:X.Y" format, aka "%s:%d.%d" [*].
Yes let's revert the quirk handling.
Quoted 5 lines
[*] It would be nice to use the same printf format "%s:%d.%d"
in bothserial_base_device_init()and also in the functions matching the devname to make it clear that these are the same names. Heh, I just guess that these are the same names.
I'll do a separate clean-up patch for that, and that can then be used for the match() too eventually.
Regards,
Tony
Re: [PATCH v3 3/3] serial: core: Rename preferred console handling for match and update
Quoted 11 lines · Tony Lindgren
Quoted 6 lines · Petr Mladek
It seems to try whether
c->devnamematches a number "X", or "ttySX". It even tries the sparc-specific transformations inserial_base_add_sparc_console()But this is the original format which does _not_ include ":". It never will be stored in
c->devnameand will never match.Good catch, this won't do anything now with
console_setup()checking for ":" for deferred consoles. So we should revert commita0f32e2dd998("serial: core: Handle serial console options").
Heh actually we can revert a lot more, basically leaving only the renamed serial_base_match_and_update_preferred_console().
Regards,
Tony
Petr Mladek
maintainerRe: [PATCH v3 3/3] serial: core: Rename preferred console handling for match and update
Quoted 9 lines · Tony Lindgren
Quoted 8 lines · Tony Lindgren
Quoted 6 lines · Petr Mladek
It seems to try whether
c->devnamematches a number "X", or "ttySX". It even tries the sparc-specific transformations inserial_base_add_sparc_console()But this is the original format which does _not_ include ":". It never will be stored in
c->devnameand will never match.
Quoted 6 lines
Quoted 3 lines
Good catch, this won't do anything now with
console_setup()checking for ":" for deferred consoles. So we should revert commita0f32e2dd998("serial: core: Handle serial console options").Heh actually we can revert a lot more, basically leaving only the renamed
serial_base_match_and_update_preferred_console().
I wonder if it would be cleaner to revert all patches adding the feature and then add back just the minimalist solution.
Best Regards,
Petr
Re: [PATCH v3 3/3] serial: core: Rename preferred console handling for match and update
Quoted 14 lines · Petr Mladek
Quoted 13 lines · Tony Lindgren
Quoted 11 lines · Tony Lindgren
Quoted 6 lines · Petr Mladek
It seems to try whether
c->devnamematches a number "X", or "ttySX". It even tries the sparc-specific transformations inserial_base_add_sparc_console()But this is the original format which does _not_ include ":". It never will be stored in
c->devnameand will never match.Good catch, this won't do anything now with
console_setup()checking for ":" for deferred consoles. So we should revert commita0f32e2dd998("serial: core: Handle serial console options").
Quoted 5 lines
Quoted 2 lines
Heh actually we can revert a lot more, basically leaving only the renamed
serial_base_match_and_update_preferred_console().I wonder if it would be cleaner to revert all patches adding the feature and then add back just the minimalist solution.
Yeah let's do that. Otherwise it's hard to see what's going on :)
Regards,
Tony