lkml.org 
[lkml]   [2021]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/9] arm64: Make profile_pc() use arch_stack_walk()
    Date
    From: "Madhavan T. Venkataraman" <madvenka@linux.microsoft.com>

    To enable RELIABLE_STACKTRACE and LIVEPATCH on arm64, we need to
    substantially rework arm64's unwinding code. As part of this, we want to
    minimize the set of unwind interfaces we expose, and avoid open-coding
    of unwind logic outside of stacktrace.c.

    Currently profile_pc() walks the stack of an interrupted context by
    calling start_backtrace() with the context's PC and FP, and iterating
    unwind steps using walk_stackframe(). This is functionally equivalent to
    calling arch_stack_walk() with the interrupted context's pt_regs, which
    will start with the PC and FP from the regs.

    Make profile_pc() use arch_stack_walk(). This simplifies profile_pc(),
    and in future will alow us to make walk_stackframe() private to
    stacktrace.c.

    At the same time, we remove the early return for when regs->pc is not in
    lock functions, as this will be handled by the first call to the
    profile_pc_cb() callback.

    There should be no functional change as a result of this patch.

    Signed-off-by: Madhavan T. Venkataraman <madvenka@linux.microsoft.com>
    Reviewed-by: Mark Rutland <mark.rutland@arm.com>
    [Mark: remove unnecessary early return, elaborate commit message]
    Signed-off-by: Mark Rutland <mark.rutland@arm.com>
    ---
    arch/arm64/kernel/time.c | 23 ++++++++++++-----------
    1 file changed, 12 insertions(+), 11 deletions(-)

    diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
    index eebbc8d7123e..070d4427327f 100644
    --- a/arch/arm64/kernel/time.c
    +++ b/arch/arm64/kernel/time.c
    @@ -32,22 +32,23 @@
    #include <asm/stacktrace.h>
    #include <asm/paravirt.h>

    -unsigned long profile_pc(struct pt_regs *regs)
    +static bool profile_pc_cb(void *arg, unsigned long pc)
    {
    - struct stackframe frame;
    + unsigned long *prof_pc = arg;

    - if (!in_lock_functions(regs->pc))
    - return regs->pc;
    + if (in_lock_functions(pc))
    + return true;
    + *prof_pc = pc;
    + return false;
    +}

    - start_backtrace(&frame, regs->regs[29], regs->pc);
    +unsigned long profile_pc(struct pt_regs *regs)
    +{
    + unsigned long prof_pc = 0;

    - do {
    - int ret = unwind_frame(NULL, &frame);
    - if (ret < 0)
    - return 0;
    - } while (in_lock_functions(frame.pc));
    + arch_stack_walk(profile_pc_cb, &prof_pc, current, regs);

    - return frame.pc;
    + return prof_pc;
    }
    EXPORT_SYMBOL(profile_pc);

    --
    2.11.0
    \
     
     \ /
      Last update: 2021-11-17 15:08    [W:2.628 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site