On Thu 2024-06-13 15:51:08, Tony Lindgren wrote:
> Let's add 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.
The patch seems to work well. And I am surprised that it is so small ;-)
I have some rather cosmetic comments.
> diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c
> index 5ebacb982f9e..a34f55ef6f37 100644
> --- a/drivers/tty/serial/serial_base_bus.c
> +++ b/drivers/tty/serial/serial_base_bus.c
> @@ -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)
I would suggest to rename also functions on the serial_base side.
The function is not adding prefcon. It is doing some match_and_update
job.
> {
> - return 0;
> + int ret;
> +
> + ret = update_preferred_console(match, dev_name, port_id);
> + if (ret == -ENOENT)
> + return 0;
> +
> + return ret;
> }
>
> #ifdef __sparc__
> --- a/kernel/printk/printk.c
> +++ b/kernel/printk/printk.c
> @@ -2486,8 +2495,8 @@ __setup("console_msg_format=", console_msg_format_setup);
> */
> static int __init console_setup(char *str)
> {
> - char buf[sizeof(console_cmdline[0].name) + 4]; /* 4 for "ttyS" */
> - char *s, *options, *brl_options = NULL;
I would add
static_assert(sizeof(console_cmdline[0].devname) >= sizeof(console_cmdline[0].name));
> + char buf[sizeof(console_cmdline[0].devname)]; /* name with "ttyS" prefix or devname */
> + char *s, *options, *brl_options = NULL, *chardev = NULL, *devname = NULL;
The name "chardev" sounds as generic as "devname". I would use one of
+ "name" like the parameter in __add_preferred_console
+ "ttyname" as it is mostly used for "tty*" console names
+ "conname" like a name in struct console.
Also please split the variables per-line so that future diff's are
easier to follow. Something like:
static_assert(sizeof(console_cmdline[0].devname) >= sizeof(console_cmdline[0].name));
char buf[sizeof(console_cmdline[0].devname)];
char *brl_options = NULL;
char *ttyname = NULL;
char *devname = NULL;
char *options;
char *s;
int idx;
> int idx;
>
> /*
> @@ -2496,17 +2505,23 @@ static int __init console_setup(char *str)
> * for exactly this purpose.
> */
> if (str[0] == 0 || strcmp(str, "null") == 0) {
> - __add_preferred_console("ttynull", 0, NULL, NULL, true);
> + __add_preferred_console("ttynull", 0, NULL, NULL, NULL, true);
> return 1;
> }
>
> if (_braille_console_setup(&str, &brl_options))
> return 1;
>
> + /* For a DEVNAME:0.0 style console the character device is unknown early */
> + if (strchr(str, ':'))
> + devname = buf;
> + else
> + chardev = buf;
> +
> /*
> * Decode str into name, index, options.
> */
> - if (isdigit(str[0]))
> + if (chardev && isdigit(str[0]))
> scnprintf(buf, sizeof(buf), "ttyS%s", str);
> else
> strscpy(buf, str);
> @@ -2523,12 +2538,12 @@ static int __init console_setup(char *str)
> #endif
>
> for (s = buf; *s; s++)
> - if (isdigit(*s) || *s == ',')
> + if ((chardev && isdigit(*s)) || *s == ',')
> break;
> idx = simple_strtoul(s, NULL, 10);
The @idx value is not really important when @devname is used.
But it still would be more clear to set it to -1.
/* @idx will get defined when devname matches. */
if (devname)
idx=-1;
else
idx = simple_strtoul(s, NULL, 10);
> *s = 0;
>
> - __add_preferred_console(buf, idx, options, brl_options, true);
> + __add_preferred_console(chardev, idx, devname, options, brl_options, true);
> return 1;
> }
> __setup("console=", console_setup);
> @@ -2548,7 +2563,38 @@ __setup("console=", console_setup);
> */
> int add_preferred_console(const char *name, const short idx, char *options)
> {
> - return __add_preferred_console(name, idx, options, NULL, false);
> + return __add_preferred_console(name, idx, NULL, options, NULL, false);
> +}
> +
> +/**
> + * update_preferred_console - Updates a preferred console if a match is found
> + * @devname: Expected console on kernel command line, such as console=DEVNAME:0.0
> + * @name: Name of the console character device to add such as ttyS
> + * @idx: Index for the console
> + *
> + * Allows driver subsystems to update a console after translating the command
> + * line name to the character device name used for the console.
I am not sure what the above sentence exactly means.
IMHO, the character device is too generic term.
> + *
> + * Return: 0 on success, negative error code on failure.
> + */
My proposal might be kind of naive. Some people might say that
it describes obvious things. But the API is for device driver
users which do not know much about how printk handles
the console command line and the registration.
<proposal>
/**
* match_devname_and_update_preferred_console - Update a preferred console
* when matching devname is found.
* @devname: DEVNAME:0.0 style device name
* @name: Name of the corresponding console driver, e.g. "ttyS"
* @idx: Console index, e.g. port number.
*
* The function checks whether a device with the given @devname is
* preferred via the console=DEVNAME:0.0 command line option.
* It fills the missing console driver name and console index
* so that a later register_console() call could find (match)
* and enable this device.
*
* It might be used when a driver subsystem initializes particular
* devices with already known DEVNAME:0.0 style names. And it
* could predict which console driver name and index this device
* would later get associated with.
*
* Return: 0 on success, negative error code on failure.
*/
</proposal>
At least, this is my understanding of how this works.
I do not know the whole history. And maybe I get something wrong.
IMHO, the main problem is that the printk console code
historically uses TTY device names. But we want to register/enable
the consoles ASAP when the HW devices are ready for writing().
It happens before the TTY subsystem gets initialized so
that we could not use the sysfs kobjects for matching
the tty device driver names with HW device driver names.
And we need this kind of hacks.
But maybe I do not have the right picture about the initialization
and the names of the pieces.
> +int update_preferred_console(const char *devname, const char *name, const short idx)
> +{
> + struct console_cmdline *c = console_cmdline;
> + int i;
> +
> + if (!devname || !strlen(devname) || !name || !strlen(name) || idx < 0)
> + return -EINVAL;
> +
> + for (i = 0; i < MAX_CMDLINECONSOLES && (c->name[0] || c->devname[0]);
> + i++, c++) {
> + if (!strcmp(devname, c->devname)) {
I would add here:
pr_info("associate the preferred console \"%s\" with \"%s%d\"\n",
devname, name, idx);
> + strscpy(c->name, name);
> + c->index = idx;
> + return 0;
> + }
> + }
> +
> + return -ENOENT;
> }
>
> bool console_suspend_enabled = true;
Best Regards,
Petr
