Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <52b18db7c4c74fc759bf455e7e4acfb1a404951b.camel@kernel.crashing.org>
Subject: Re: [PATCH v3 2/3] printk: Fix preferred console selection with
 multiple matches
From:   Benjamin Herrenschmidt <benh@kernel.crashing.org>
To:     Petr Mladek <pmladek@suse.com>
Cc:     Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Date:   Tue, 11 Feb 2020 16:33:57 +0100
In-Reply-To: <20200211144134.fyxxphyr32dkmhsw@pathway.suse.cz>
References: <97dc50d411e10ac8aab1de0376d7a535fea8c60a.camel@kernel.crashing.org>
         <20200211144134.fyxxphyr32dkmhsw@pathway.suse.cz>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, 2020-02-11 at 15:41 +0100, Petr Mladek wrote:
> 
> > diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
> > index 17602d7b7ffc..5cf47a7b880c 100644
> > --- a/kernel/printk/printk.c
> > +++ b/kernel/printk/printk.c
> > @@ -2674,8 +2679,13 @@ static int try_enable_new_console(struct console *newcon)
> >  	/*
> >           * Some consoles, such as pstore and netconsole, can be enabled even
> >           * without matching.
> > +	 *
> > +	 * Note: We only do this test on the !user_specified pass so that such
> > +	 * a statically enabled console that isn't user specified gets a chance
> > +	 * to have its match() or setup() function called on our second pass
> > +	 * through this function.
> 
> I had some troubles to part the comment. I wonder if the following is
> more clear:
> 
> 	* Accept pre-enabled consoles only when match() and setup()
> 	* was called.

Yeah the sentence is a bit convoluted, I agree. As for the fix, see
below

> And I would do the same check as in the for cycle:
> 
> 	if (newcon->flags & CON_ENABLED && c->user_specified ==	user_specified)
> 		return 0;

Fair enough, this is simpler.

> With the above change:
> 
> Reviewed-by: Petr Mladek <pmladek@suse.com>
> 
> I could do the change when pushing if you agree and v4 is not needed
> for other reasons.

Of course. I'm travelling this week (which is why I somewhat rushed
sending you the patches last week, hence the glitches you noted), so I
won't have a chance to repost until sometime next week.

> 
> PS: JFYI, I am going to look at the 3rd patch tomorrow. I have to go now.

No worries. It's not super important, it's a minor thing I noticed
while testing (when I artifically make my consoles not match to test
the "default" fallback). It's not directly related to the fix in patch
2, but is completely standlaone.

Cheers,
Ben.