Messages in this thread | | | Date | Tue, 27 Sep 2022 17:16:43 +0200 | From | Petr Mladek <> | Subject | Re: [PATCH printk 06/18] printk: Protect [un]register_console() with a mutex |
| |
Resending my review on this patch also in this patchset. I sent the review also to the RFC patchset by mistake, see https://lore.kernel.org/r/YzLIy4emYX6JpzuN@alley
Please, continue the discussion here where I did review of the other patches.
On Sat 2022-09-24 02:10:42, John Ogness wrote: > From: Thomas Gleixner <tglx@linutronix.de> > > Unprotected list walks are a brilliant idea. Especially in the context of > hotpluggable consoles.
Yeah, it is crazy. And it is there probably since the beginning.
> The new list lock provides not only synchronization for console list > manipulation, but also for manipulation of console->flags: > > console_list_lock(); > console_lock(); > > /* may now manipulate the console list and/or console->flags */ > > console_unlock(); > console_list_unlock(); > > Therefore it is safe to iterate the console list and read console->flags > if holding either the console lock or the console list lock. > > --- a/kernel/printk/printk.c > +++ b/kernel/printk/printk.c > @@ -79,10 +79,17 @@ int oops_in_progress; > EXPORT_SYMBOL(oops_in_progress); > > /* > - * console_sem protects the console_drivers list, and also > - * provides serialisation for access to the entire console > - * driver system. > + * console_sem protects the console_drivers list, and also provides > + * serialization for access to the entire console driver system. > + * > + * console_mutex serializes register/unregister. > + * > + * console_sem must be taken inside a console_mutex locked section > + * for any list manipulation in order to keep the console BKL > + * machinery happy. This requirement also applies to manipulation > + * of console->flags. > */ > +static DEFINE_MUTEX(console_mutex); > static DEFINE_SEMAPHORE(console_sem); > struct console *console_drivers; > EXPORT_SYMBOL_GPL(console_drivers); > @@ -220,6 +233,28 @@ int devkmsg_sysctl_set_loglvl(struct ctl_table *table, int write, > } > #endif /* CONFIG_PRINTK && CONFIG_SYSCTL */ > > +/** > + * console_list_lock - Lock the console list > + * > + * For non-console related list walks, e.g. procfs, sysfs... > + */ > +void console_list_lock(void) > +{ > + mutex_lock(&console_mutex); > +} > +EXPORT_SYMBOL(console_list_lock); > + > +/** > + * console_list_unlock - Unlock the console list > + * > + * Counterpart to console_list_lock() > + */ > +void console_list_unlock(void) > +{ > + mutex_unlock(&console_mutex); > +} > +EXPORT_SYMBOL(console_list_unlock); > + > /* > * Helper macros to handle lockdep when locking/unlocking console_sem. We use > * macros instead of functions so that _RET_IP_ contains useful information. > @@ -3081,6 +3120,8 @@ static void try_enable_default_console(struct console *newcon) > (con->flags & CON_BOOT) ? "boot" : "", \ > con->name, con->index, ##__VA_ARGS__) > > +static int console_unregister_locked(struct console *console); > + > /* > * The console driver calls this routine during kernel initialization > * to register the console printing procedure with printk() and to > @@ -3107,13 +3148,14 @@ void register_console(struct console *newcon) > bool realcon_enabled = false; > int err; > > - for_each_console(con) { > + console_list_lock();
Hmm, the new mutex is really nasty. It has very strange semantic. It makes the locking even more complicated.
The ideal solution would be take console_lock() here. We (me and Sergey) never did it because con->match() and con->setup() callbacks were called in try_enable_*console(). We were afraid that some might want to take console_lock() and it could create a deadlock. There were too many drivers and we did not found time to check them all. And it had low priority because nobody reported problems.
A good enough solution might be call this under the later added srcu_read_lock(&console_srcu) and use for_each_console_srcu().
The srcu walk would prevent seeing broken list. Obviously, the code might see outdated list and do bad decisions:
+ try to enable the same console twice
+ enable more consoles by default in try_enable_default_console()
+ associate more consoles with /dev/console, see CON_CONSDEV in try_enable_preferred_console() and try_enable_default_console()
If we race then we could end up with more consoles enabled by default and with more consoles with CON_CONSDEV flag.
IMHO, the rcu walk is an acceptable and conservative solution. Registering the same driver twice is hard to imagine at all. And I have never seen reports about too many default consoles or CON_CONSDEV flags.
Anyway, I would like to avoid adding console_mutex. From my POV, it is a hack that complicates the code. Taking console_lock() should be enough. Using rcu walk would be good enough.
Do I miss something, please?
Or is this part of some strategy to remove console_sem later, please?
> + for_each_registered_console(con) { > if (WARN(con == newcon, "console '%s%d' already registered\n", > con->name, con->index)) > - return; > + goto unlock; > } > > - for_each_console(con) { > + for_each_registered_console(con) { > if (con->flags & CON_BOOT) > bootcon_enabled = true; > else
Best Regards, Petr
| |