On (07/11/17 09:50), Daniel Vetter wrote: [..] > > ok, obviously stupid. > > > > I meant to hold con->lock between console_disable() and console_enable(). > > so no other CPU can unregister it, etc. printk->console_unlock(), thus, > > can either have a racy con->flags check (no con->lock taken) or try > > something like down_trylock(&con->lock): if it fails, continue. > > I don't think you need the CON_ENABLED flag, just holding the per-console > lock should be enough (I hope). Or what exactly is the idea behind this. > I'm also not sure whether dropping the main console_lock is a good idea. CON_ENABLED thing is completely broken, yes. my apologies. what I really wanted to think about was something as below vprintk_emit() down_trylock(console_sem) console_unlock() console_unlock() runs under console_sem, but in order to ->write() it does down_trylock(con->lock) on every console. the functions that modify consoles do: down(console_sem) down(con->lock); up(console_sem); "do things to con" up(con->lock); down_trylock(console_sem) // if it fails then someone else will do the printing console_unlock(); so console_unlock() will "pass on" those "frozen" consoles. the next time we are in console_unlock() again, we will notice that console has its "seen message IDX" behind the current log idx and will flush the (if console semaphore will be available). so the loop is for_each_console (con) { if (!down_trylock(con->lock)) continue; while (con->console_seq != log_next_seq) { msg_print_text(); con->console_seq++; if (!(con->flags & CON_ENABLED)) break; if (!con->write) break; if (!cpu_online(smp_processor_id()) && !(con->flags & CON_ANYTIME)) break; if (con->flags & CON_EXTENDED) con->write(con, ext_text, ext_len); else con->write(con, text, len); } up(con->lock); } up(console_sem); > What I had in mind for the printk look is to not even hold the main > console_lock, but only grab the individual console_locks (plus the printk > buffer spinlock ofc), so may be console_sem won't be needed for printk at all. need to think more. I think I just wanted to jump over all those "suspend all console drivers" etc for hibernate and other cases that we might be missing at the moment. so, no big and heavy console manipulations should be performed under console_sem. we take console_sem briefly, find the right console, take its ->lock, unlock console_sem. from now on the we the console, nothing else should be able to concurrently un-register it, etc. etc. > for_each_console(con) > if (!mutex_trylock(con->mutex)) > continue; > > /* pseudo-code, whatever we need to check to make sure > * this console is real and fully registered. */ > if (!(con->flags & CON_ENABLED)) > continue; > > if (con_requires_kthread(con)) { > wake_up(con->printk_wq); > > /* this is for consoles that grab massive amounts > * of locks, like fbcon. We could repurpose klogd > * for this perhaps. */ > > continue; > } > > /* do the actual printing business */ > } hm... ok. very close, but not exactly what I was thinking about. may be guys your ideas are better. per-console printing kthread, hm. interesting. > Very rough pseudo-code draft without looking at the details. The things > we'd need to do to get there: > > - Audit _all_ the places that use console_lock to protect global data > structures. Excessively sprinkle lockdep_assert_held(&console_lock_map); > over them to make sure we don't break stuff. We'll probably want to > stuff that lockdep assert into for_each_console (and have a > special/open-coded one for the printk loop). > > - Add con->mutex. Make sure that lock properly serializes against > the last step in register_console and the first step in > unregister_console. CON_ENABLED seems like the critical flag. a silly side-note, we must be able to console_unlock() from IRQ. mutex_trylock() cannot be used in atomic, because it might sleep, unlike semaphore. > - Wrap all call to console callbacks in a mutex_lock(con->mutex) critical > sections. > > - Sprinkle lockdep_assert_held(con->mutex) into all the console callbacks > of a few common console backends (fbcon + serial should be enough), to > make sure that part is solid. > > - Do the above changes in the printk loop. It also needs to be extracted > from console_unlock so that we can replace the > > if (console_try_lock()) > console_unlock(); > > pattern for pushing out the printk buffer with maybe a new > printk_flush() function, which does _not_ try to acquire console_lock. > > - console_unlock() still needs to flush out the printk buffers, to make > sure we haven't lost any lines. Or we'll rely on klogd to ensure > everything gets printed, when the trylock path doesn't work out. > > I think this would give us a reasonable locking design, allows us to not > stall on slow consoles when trying to dump emergency output to serial, and > it would decouple printk entirely from the huge console_lock mess. And as > long as we carefully audit for global stuff (everywhere, not just in > printk.c) in the first step I think it should be a safe transition. many thanks for the inputs! I'll think more about it. -ss _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel