lkml.org 
[lkml]   [2016]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/6] x86/dumpstack: make printk_stack_address() more generally useful
    Date
    Change printk_stack_address() to be useful when called by an unwinder
    outside the context of dump_trace().

    Specifically:

    - printk_stack_address()'s 'data' argument is always used as the log
    level string. Make that explicit.

    - Call touch_nmi_watchdog().

    Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
    ---
    arch/x86/kernel/dumpstack.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
    index 01072e9..f0ddf85 100644
    --- a/arch/x86/kernel/dumpstack.c
    +++ b/arch/x86/kernel/dumpstack.c
    @@ -26,10 +26,11 @@ int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE;
    static int die_counter;

    static void printk_stack_address(unsigned long address, int reliable,
    - void *data)
    + char *log_lvl)
    {
    + touch_nmi_watchdog();
    printk("%s [<%p>] %s%pB\n",
    - (char *)data, (void *)address, reliable ? "" : "? ",
    + log_lvl, (void *)address, reliable ? "" : "? ",
    (void *)address);
    }

    @@ -148,7 +149,6 @@ static int print_trace_stack(void *data, char *name)
    */
    static int print_trace_address(void *data, unsigned long addr, int reliable)
    {
    - touch_nmi_watchdog();
    printk_stack_address(addr, reliable, data);
    return 0;
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:4.270 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site