From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D133CD4F58 for ; Tue, 19 May 2026 06:50:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=azyUJ35drB6eBvHruuuz2oV972yj5pSTtfb7XbUuZ9M=; b=xVUMry1YhC2rdp/Hgs3DYvL9z8 wpNG6g1TqmhRZ/MK3eUrpXdoWuz9aBryJ9EAM2RMK9gNhGy9iTXQeiIMoYklbW5cTrT+53+38Za67 LSFbvQT8n4jjRyN6aq53DHiNs/Owv5YFldFKNBi73ENsljOsbnqTgVL6b+BbK8QazmN3dkdGxThaH NegiaQTZMZ8KzUo3+xYITbBS9dJKVm1V9FkaKPvNP5bIDOX2O43J+ZDrL/xQNhGzkWv1kNwqvoKd4 d2KPDLDoqwi9zXOjEdfrylFpelZs+J8RWXCyKwV3k7HSyG3bRGKFS4supy6rE1rNc5AoxuwGqAzio SHOJSYWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wPEHd-00000000OhZ-1pOe; Tue, 19 May 2026 06:50:29 +0000 Received: from mail-pf1-x44a.google.com ([2607:f8b0:4864:20::44a]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wPEHY-00000000OdD-0Aa8 for linux-arm-kernel@lists.infradead.org; Tue, 19 May 2026 06:50:25 +0000 Received: by mail-pf1-x44a.google.com with SMTP id d2e1a72fcca58-836d0184333so4605942b3a.0 for ; Mon, 18 May 2026 23:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779173423; x=1779778223; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=azyUJ35drB6eBvHruuuz2oV972yj5pSTtfb7XbUuZ9M=; b=pYI/Nu5h5c/oSH8edIufjW4AlQwW6KmvYqnVxDm54ubbSh8Y98OtRxKHxd/s87kbJE 3rpFbjZzQL42dxsInaaa3Zblc5Lm8loM9Pn8dAEdAn29P8PyFpjjVtG6gu5Wn+mDVMOk bt1mJrrcfm67HxvoMtDy6emcQgG5ZUftsQwvMPsucCFcZm/ie96SGLUpCm1aJnx/QBg9 3d4uLi52DF3zxfsHKnXIMFpgAj7a/xIgAGgPAraft6tGIfFo0gdriwAKrICrmtUY27/p ExMQC0JQw29ZRAnzAa5NZxSIw9dpHRz3oBik81kcjxHE23eVkOPRxyvB4fI9qULTYcKk 0LFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779173423; x=1779778223; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=azyUJ35drB6eBvHruuuz2oV972yj5pSTtfb7XbUuZ9M=; b=IOFJvh3dCJPoCPeWpbYUckwd9g7sGhZlhF8zmF/C5XzzAf0upbxBqeVvFZCd2Tw3BO B0tEaZgbOd2hfCJtiJh3shMG3re1Up7vTCvSd+W5rwdu7Wi1stmu/zBwAc4KQbDvB1uw mTlCprEF1CIn/qze8LtJjym4gbQfd3IVXsS21L2GbkBczrPZ6ShCo9pkhj+u57AV9sFn vjYgFLdLSuUrVUlvvlzqSAW89BM4LxJApEC/lwMjTv/tRhPlrcG74CCurc0t85PCG13o r2tTgoE6rFMZ7N4vzSlMp/1boL1H244fEiEdvSm7YXmxzoWkE1oAWs8QFyZxz3iuBlfp eS2Q== X-Forwarded-Encrypted: i=1; AFNElJ+CPmDUOI2d37F1pOy43rxT75tcetFClEjSzurCUWuhvllUC/6RomgaQCE9HwjYu1J7wDrX6xzcGH9dW1JTLlSg@lists.infradead.org X-Gm-Message-State: AOJu0YwDNqKamST13N7s0EEL/82MNZTXihxI6XZ2m1V29sDgEsvQlVyN YLv6KP2mGRowN4rdX16TUyy2ZNNEmunLfebzn9Xk5fqKUNHh+AZsF7y20k2+IQmitisO6Hc+Ndg +u2knSZNSOd//WXkkuGJrCED4+g== X-Received: from pfbfk10.prod.google.com ([2002:a05:6a00:3a8a:b0:83f:2647:b711]) (user=dylanbhatch job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:a10:b0:83e:c8f8:cec7 with SMTP id d2e1a72fcca58-83f33dddb8cmr18668832b3a.35.1779173422844; Mon, 18 May 2026 23:50:22 -0700 (PDT) Date: Tue, 19 May 2026 06:49:50 +0000 In-Reply-To: <20260519064950.493949-1-dylanbhatch@google.com> Mime-Version: 1.0 References: <20260519064950.493949-1-dylanbhatch@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260519064950.493949-10-dylanbhatch@google.com> Subject: [PATCH v6 9/9] unwind: arm64: Use sframe to unwind interrupt frames From: Dylan Hatch To: Roman Gushchin , Weinan Liu , Will Deacon , Josh Poimboeuf , Indu Bhagat , Peter Zijlstra , Steven Rostedt , Catalin Marinas , Jiri Kosina , Mark Rutland , Jens Remus Cc: Dylan Hatch , Prasanna Kumar T S M , Puranjay Mohan , Song Liu , joe.lawrence@redhat.com, linux-toolchains@vger.kernel.org, linux-kernel@vger.kernel.org, live-patching@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Randy Dunlap , Mostafa Saleh , Herbert Xu , "David S. Miller" Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260518_235024_097144_82F89FA8 X-CRM114-Status: GOOD ( 27.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add unwind_next_frame_sframe() function to unwind by sframe info if present. Use this method at exception boundaries, falling back to frame-pointer unwind only on failure. In such failure cases, the stacktrace is considered unreliable. During normal unwind, prefer frame pointer unwind (for better performance) with sframe as a backup. This change restores the LR behavior originally introduced in commit c2c6b27b5aa14fa2 ("arm64: stacktrace: unwind exception boundaries"), But later removed in commit 32ed1205682e ("arm64: stacktrace: Skip reporting LR at exception boundaries") This can be done because the sframe data can be used to determine whether the LR is current for the PC value recovered from pt_regs at the exception boundary. Signed-off-by: Weinan Liu Reviewed-by: Prasanna Kumar T S M Reviewed-by: Jens Remus Signed-off-by: Dylan Hatch --- arch/arm64/kernel/stacktrace.c | 222 ++++++++++++++++++++++++++++++--- 1 file changed, 202 insertions(+), 20 deletions(-) diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c index 3ebcf8c53fb0..cee860ca8ce5 100644 --- a/arch/arm64/kernel/stacktrace.c +++ b/arch/arm64/kernel/stacktrace.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -26,6 +27,7 @@ enum kunwind_source { KUNWIND_SOURCE_CALLER, KUNWIND_SOURCE_TASK, KUNWIND_SOURCE_REGS_PC, + KUNWIND_SOURCE_REGS_LR, }; union unwind_flags { @@ -45,6 +47,7 @@ union unwind_flags { * @kr_cur: When KRETPROBES is selected, holds the kretprobe instance * associated with the most recently encountered replacement lr * value. + * @unreliable: Stacktrace is unreliable. */ struct kunwind_state { struct unwind_state common; @@ -56,6 +59,7 @@ struct kunwind_state { enum kunwind_source source; union unwind_flags flags; struct pt_regs *regs; + bool unreliable; }; static __always_inline void @@ -181,7 +185,6 @@ int kunwind_next_regs_pc(struct kunwind_state *state) state->regs = regs; state->common.pc = regs->pc; state->common.fp = regs->regs[29]; - state->regs = NULL; state->source = KUNWIND_SOURCE_REGS_PC; return 0; } @@ -244,6 +247,168 @@ kunwind_next_frame_record(struct kunwind_state *state) return 0; } +#ifdef CONFIG_HAVE_UNWIND_KERNEL_SFRAME + +static __always_inline struct stack_info * +get_word(struct unwind_state *state, unsigned long *word) +{ + unsigned long addr = *word; + struct stack_info *info; + + info = unwind_find_stack(state, addr, sizeof(addr)); + if (!info) + return info; + + *word = READ_ONCE(*(unsigned long *)addr); + + return info; +} + +static __always_inline int +get_consume_word(struct unwind_state *state, unsigned long *word) +{ + struct stack_info *info; + unsigned long addr = *word; + + info = get_word(state, word); + if (!info) + return -EINVAL; + + unwind_consume_stack(state, info, addr, sizeof(addr)); + return 0; +} + +/* + * Unwind from a pt_regs according to sframe. + */ +static __always_inline int +kunwind_next_regs_sframe(struct kunwind_state *state) +{ + struct unwind_frame frame; + unsigned long cfa, fp, ra; + enum kunwind_source source = KUNWIND_SOURCE_FRAME; + struct pt_regs *regs = state->regs; + + int err; + + if (WARN_ON_ONCE(state->source != KUNWIND_SOURCE_REGS_PC)) + return -EINVAL; + if (WARN_ON_ONCE(!state->regs)) + return -EINVAL; + + /* FP/SP alignment 8 bytes */ + if (state->common.fp & 0x7) + return -EINVAL; + + err = sframe_find_kernel(state->common.pc, &frame); + if (err) + return -EINVAL; + + /* + * A kernel unwind should always end at a FRAME_META_TYPE_FINAL + * frame. There should be no outermost frames within the kernel. + */ + if (frame.outermost) + return -EINVAL; + + /* Get the Canonical Frame Address (CFA) */ + switch (frame.cfa.rule) { + case UNWIND_CFA_RULE_SP_OFFSET: + cfa = state->regs->sp; + break; + case UNWIND_CFA_RULE_FP_OFFSET: + if (state->common.fp < state->regs->sp) + return -EINVAL; + cfa = state->common.fp; + break; + /* + * UNWIND_CFA_RULE_REG_OFFSET and UNWIND_CFA_RULE_REG_OFFSET_DEREF not + * implemented -- flexible FDEs are not currently generated by assembler + * for arm64. + */ + default: + WARN_ON_ONCE(1); + return -EINVAL; + } + cfa += frame.cfa.offset; + + /* CFA alignment 16 bytes */ + if (cfa & 0x15) + return -EINVAL; + + /* Get the Return Address (RA) */ + switch (frame.ra.rule) { + case UNWIND_RULE_RETAIN: + ra = regs->regs[30]; + source = KUNWIND_SOURCE_REGS_LR; + break; + + /* + * UNWIND_RULE_CFA_OFFSET doesn't make sense for RA. + * The return address cannot legitimately be a stack address. + */ + case UNWIND_RULE_CFA_OFFSET_DEREF: + ra = cfa + frame.ra.offset; + break; + /* + * UNWIND_RULE_REG_OFFSET and UNWIND_RULE_REG_OFFSET_DEREF not + * implemented -- flexible FDEs are not currently generated by assembler + * for arm64. + */ + default: + WARN_ON_ONCE(1); + return -EINVAL; + } + + /* Get the Frame Pointer (FP) */ + switch (frame.fp.rule) { + case UNWIND_RULE_RETAIN: + fp = state->common.fp; + break; + /* + * UNWIND_RULE_CFA_OFFSET is currently not used for FP + * (e.g. SFrame cannot represent this rule). + */ + case UNWIND_RULE_CFA_OFFSET_DEREF: + fp = cfa + frame.fp.offset; + break; + /* + * UNWIND_RULE_REG_OFFSET and UNWIND_RULE_REG_OFFSET_DEREF not + * implemented -- flexible FDEs are not currently generated by assembler + * for arm64. + */ + default: + WARN_ON_ONCE(1); + return -EINVAL; + } + + /* + * Consume RA and FP from the stack. The frame record puts FP at a lower + * address than RA, so we always read FP first. + */ + if (frame.fp.rule & UNWIND_RULE_DEREF && + !get_word(&state->common, &fp)) + return -EINVAL; + + if (frame.ra.rule & UNWIND_RULE_DEREF && + get_consume_word(&state->common, &ra)) + return -EINVAL; + + state->common.pc = ra; + state->common.fp = fp; + + state->source = source; + + return 0; +} + +#else /* !CONFIG_HAVE_UNWIND_KERNEL_SFRAME */ + +static __always_inline int +unwind_next_frame_sframe(struct kunwind_state *state) { return -EINVAL; } + +#endif /* !CONFIG_HAVE_UNWIND_KERNEL_SFRAME*/ + /* * Unwind from one frame record (A) to the next frame record (B). * @@ -259,10 +424,20 @@ kunwind_next(struct kunwind_state *state) state->flags.all = 0; switch (state->source) { + case KUNWIND_SOURCE_REGS_PC: + err = kunwind_next_regs_sframe(state); + + if (err && err != -ENOENT) { + /* Fallback to FP based unwinder */ + err = kunwind_next_frame_record(state); + state->unreliable = true; + } + state->regs = NULL; + break; case KUNWIND_SOURCE_FRAME: case KUNWIND_SOURCE_CALLER: case KUNWIND_SOURCE_TASK: - case KUNWIND_SOURCE_REGS_PC: + case KUNWIND_SOURCE_REGS_LR: err = kunwind_next_frame_record(state); break; default: @@ -390,34 +565,40 @@ noinline noinstr void arch_stack_walk(stack_trace_consume_fn consume_entry, kunwind_stack_walk(arch_kunwind_consume_entry, &data, task, regs); } +struct kunwind_reliable_consume_entry_data { + stack_trace_consume_fn consume_entry; + void *cookie; + bool unreliable; +}; + static __always_inline bool -arch_reliable_kunwind_consume_entry(const struct kunwind_state *state, void *cookie) +arch_kunwind_reliable_consume_entry(const struct kunwind_state *state, void *cookie) { - /* - * At an exception boundary we can reliably consume the saved PC. We do - * not know whether the LR was live when the exception was taken, and - * so we cannot perform the next unwind step reliably. - * - * All that matters is whether the *entire* unwind is reliable, so give - * up as soon as we hit an exception boundary. - */ - if (state->source == KUNWIND_SOURCE_REGS_PC) - return false; + struct kunwind_reliable_consume_entry_data *data = cookie; - return arch_kunwind_consume_entry(state, cookie); + if (state->unreliable) { + data->unreliable = true; + return false; + } + return data->consume_entry(data->cookie, state->common.pc); } -noinline noinstr int arch_stack_walk_reliable(stack_trace_consume_fn consume_entry, - void *cookie, - struct task_struct *task) +noinline notrace int arch_stack_walk_reliable( + stack_trace_consume_fn consume_entry, + void *cookie, struct task_struct *task) { - struct kunwind_consume_entry_data data = { + struct kunwind_reliable_consume_entry_data data = { .consume_entry = consume_entry, .cookie = cookie, + .unreliable = false, }; - return kunwind_stack_walk(arch_reliable_kunwind_consume_entry, &data, - task, NULL); + kunwind_stack_walk(arch_kunwind_reliable_consume_entry, &data, task, NULL); + + if (data.unreliable) + return -EINVAL; + + return 0; } struct bpf_unwind_consume_entry_data { @@ -452,6 +633,7 @@ static const char *state_source_string(const struct kunwind_state *state) case KUNWIND_SOURCE_CALLER: return "C"; case KUNWIND_SOURCE_TASK: return "T"; case KUNWIND_SOURCE_REGS_PC: return "P"; + case KUNWIND_SOURCE_REGS_LR: return "L"; default: return "U"; } } -- 2.54.0.563.g4f69b47b94-goog