lkml.org 
[lkml]   [2023]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH printk v1 03/18] printk: Consolidate console deferred printing
    Date
    Printig to consoles can be deferred for several reasons:

    - explicitly with printk_deferred()
    - printk() in NMI context
    - recursive printk() calls

    The current implementation is not consistent. For printk_deferred(),
    irq work is scheduled twice. For NMI und recursive, panic CPU
    suppression and caller delays are not properly enforced.

    Correct these inconsistencies by consolidating the deferred printing
    code so that vprintk_deferred() is the toplevel function for
    deferred printing and vprintk_emit() will perform whichever irq_work
    queueing is appropriate.

    Also add kerneldoc for wake_up_klogd() and defer_console_output() to
    clarify their differences and appropriate usage.

    Signed-off-by: John Ogness <john.ogness@linutronix.de>
    ---
    kernel/printk/printk.c | 31 ++++++++++++++++++++++++-------
    kernel/printk/printk_safe.c | 9 ++-------
    2 files changed, 26 insertions(+), 14 deletions(-)

    diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
    index 84af038292d9..bdeaf12e0bd2 100644
    --- a/kernel/printk/printk.c
    +++ b/kernel/printk/printk.c
    @@ -2321,7 +2321,10 @@ asmlinkage int vprintk_emit(int facility, int level,
    preempt_enable();
    }

    - wake_up_klogd();
    + if (in_sched)
    + defer_console_output();
    + else
    + wake_up_klogd();
    return printed_len;
    }
    EXPORT_SYMBOL(vprintk_emit);
    @@ -3811,11 +3814,30 @@ static void __wake_up_klogd(int val)
    preempt_enable();
    }

    +/**
    + * wake_up_klogd - Wake kernel logging daemon
    + *
    + * Use this function when new records have been added to the ringbuffer
    + * and the console printing for those records is handled elsewhere. In
    + * this case only the logging daemon needs to be woken.
    + *
    + * Context: Any context.
    + */
    void wake_up_klogd(void)
    {
    __wake_up_klogd(PRINTK_PENDING_WAKEUP);
    }

    +/**
    + * defer_console_output - Wake kernel logging daemon and trigger
    + * console printing in a deferred context
    + *
    + * Use this function when new records have been added to the ringbuffer
    + * but the current context is unable to perform the console printing.
    + * This function also wakes the logging daemon.
    + *
    + * Context: Any context.
    + */
    void defer_console_output(void)
    {
    /*
    @@ -3832,12 +3854,7 @@ void printk_trigger_flush(void)

    int vprintk_deferred(const char *fmt, va_list args)
    {
    - int r;
    -
    - r = vprintk_emit(0, LOGLEVEL_SCHED, NULL, fmt, args);
    - defer_console_output();
    -
    - return r;
    + return vprintk_emit(0, LOGLEVEL_SCHED, NULL, fmt, args);
    }

    int _printk_deferred(const char *fmt, ...)
    diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c
    index ef0f9a2044da..6d10927a07d8 100644
    --- a/kernel/printk/printk_safe.c
    +++ b/kernel/printk/printk_safe.c
    @@ -38,13 +38,8 @@ asmlinkage int vprintk(const char *fmt, va_list args)
    * Use the main logbuf even in NMI. But avoid calling console
    * drivers that might have their own locks.
    */
    - if (this_cpu_read(printk_context) || in_nmi()) {
    - int len;
    -
    - len = vprintk_store(0, LOGLEVEL_DEFAULT, NULL, fmt, args);
    - defer_console_output();
    - return len;
    - }
    + if (this_cpu_read(printk_context) || in_nmi())
    + return vprintk_deferred(fmt, args);

    /* No obstacles. */
    return vprintk_default(fmt, args);
    --
    2.30.2
    \
     
     \ /
      Last update: 2023-03-27 00:42    [W:4.151 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site