From: Petr Mladek <pmladek@suse.com>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linux-kernel@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH v2] printk: Fix preferred console selection with multiple matches
Date: Fri, 20 Dec 2019 10:11:31 +0100 [thread overview]
Message-ID: <20191220091131.4uifcbudwppjspf4@pathway.suse.cz> (raw)
In-Reply-To: <32fde8cd451ea0eaff38108d9f2f2d4a97a43097.camel@kernel.crashing.org>
On Fri 2019-12-20 08:48:24, Benjamin Herrenschmidt wrote:
> On Thu, 2019-12-19 at 14:50 +0100, Petr Mladek wrote:
> > The code really need simplification. I would prefer to take the risk
> > and reduce the amount of added conditions as much as possible.
> > I have an idea, see below.
>
> I wanted you to say that :-) I'll rework along those lines. Just a nit
> or two:
> >
> >
> > > --- a/kernel/printk/printk.c
> > > +++ b/kernel/printk/printk.c
> > > @@ -2542,6 +2545,53 @@ static int __init keep_bootcon_setup(char *str)
> > >
> > > early_param("keep_bootcon", keep_bootcon_setup);
> > >
> > > +enum con_match {
> > > + con_matched,
> > > + con_matched_preferred,
> > > + con_braille,
> > > + con_failed,
> > > + con_no_match,
> > > +};
> >
> > Please, replace this with int, where:
> >
> > + con_matched -> 0
> > + con_matched_preferred -> 0 and make "has_preferred" global variable
> > + con_braile -> 0 later check for CON_BRL flag
> > + con_failed -> -EFAULT
> > + con_no_match -> -ENOENT
>
> Not fan of using -EFAULT here, it's a detail since it's rather kernel
> internal, but I'd rather use -ENXIO for no match and -EIO for failed
> (or pass the original error code up if any). That said it's really bike
> shed painting at this point :-)
Sigh, either variant is somehow confusing.
I think that -ENOENT is a bit better than -EIO. It is abbreviation of
"No entry or No entity" which quite fits here. Also the device might
exist but it is not used when not requested.
I do not mind about -EFAULT vs -EIO. Well, -EIO might actually
better describe the reality.
That said, I do not want to spend much time on bikesheding. Feel free
to use whatever looks better to you.
> > > @@ -2615,41 +2664,19 @@ void register_console(struct console *newcon)
> > /* Prefer command line over platform specific defaults. */
> > err = try_match_new_console(newcon, true);
> > if (err = -ENOENT)
> > err = try_match_new_console(newcon, false);
> >
> > /* printk() messages are not printed to Braille consoles. */
> > if (err || console->flags | CON_BRL)
> > return;
>
> So this changes the existing behaviour in one way that may or may not
> matter, I don't know:
>
> If setup() fails, the existing code will not exit. That means that if
> the console has CON_ENABLED already set (some do set it statically or
> set it from outside this function, I haven't looked into details the
> various circumstances this can happen), the existing code will still
> insert it. Your patch will make us not insert it.
Great catch! There is still a lot to learn about this code.
It seems that, for example, pstore and netconsole are not added
into console_cmdline and do not match. They relly on the explicitely
set CON_ENABLED.
I would prefer to hide this into the new "shorter" function. I would
rename it to try_enable_new_console() and add the following at the end:
/*
* For example, pstore, netconsole, are enabled even
* without matching.
*/
if (console->flags & CON_ENABLED)
return 0;
Best Regards,
Petr
next prev parent reply other threads:[~2019-12-20 9:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 1:08 Benjamin Herrenschmidt
2019-12-17 5:45 ` Sergey Senozhatsky
2019-12-19 13:50 ` Petr Mladek
2019-12-19 21:48 ` Benjamin Herrenschmidt
2019-12-20 9:11 ` Petr Mladek [this message]
2020-01-06 5:15 ` Sergey Senozhatsky
2020-01-06 10:25 ` Petr Mladek
2020-01-07 0:50 ` Benjamin Herrenschmidt
2020-01-07 5:19 ` Sergey Senozhatsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191220091131.4uifcbudwppjspf4@pathway.suse.cz \
--to=pmladek@suse.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®