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 02D9FCA5FFC for ; Wed, 7 Oct 2026 11:44:28 +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=eFSHjFOLKNYfg5vGl5+rLOLoS1KQOBHgGSX+EFL2Pdg=; b=vNdDdXSp7JsbZk75bllnBDIkJR qnnXFTwEhp+wImGO95wGlQgLEiA5zAPG3RJtsf41Kz8vNzgPIoZb7AtGTdV2g5x0EgHSqLRW/vG1X Q0Ut49E+kZoCvQ0uQMS9UkxKXwzUyNsWp2ApT00ZhQJCiYaWVM0QVR2Xs9ts/6VnWqdoljO/GSqdB l1pSjkbPjcf13jVIG3JU5JoTjdKLFFfe3Ibwyjd7mPto3anRYPGTYz+IKeP9WMU96gTYMRD/TH3Fd 99fBRPPPZWy5SjBkBhGoh4eBrYcAs/wpSJridtDuwq1Y5CpeXlZm/SwHWP47cTEnWAj0tv2Pauxx+ ZidsK6kw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xEQ4L-00000002NDS-1GF9; Wed, 07 Oct 2026 11:44:21 +0000 Received: from mail-pj1-x1046.google.com ([2607:f8b0:4864:20::1046]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xEQ49-00000002MzK-22tY for linux-arm-kernel@lists.infradead.org; Wed, 07 Oct 2026 11:44:12 +0000 Received: by mail-pj1-x1046.google.com with SMTP id 98e67ed59e1d1-3a85a33333cso1737350a91.0 for ; Wed, 07 Oct 2026 04:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1791373448; x=1791978248; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=eFSHjFOLKNYfg5vGl5+rLOLoS1KQOBHgGSX+EFL2Pdg=; b=tpHDzlSzX2CQWXEmd51ayPC5HV8tDiwx7NUdv/2F1VT4nrlqvn+21jRGJy2ZCr0s79 WbtItL5w1/4ymfB9BANBsDFWQ1Nk+Fz8ditublRKkhBWD7+P80by4/z7qHnHhCIrvhG8 gO+zPWJxU4kea7ky90V6xm8a041kwDaK5hGLOWdsKJRdWmAvQl5USGxs5vSfJ7ZnYH03 tkkkw/R++J0avY79+K7zlM0DDLr627z/MI/PccNVFfULEWc2CA3A/hixQSZmISINh5+Z 8lSFs8arpN8q8xzmcIXw++5BxyCIv2/WdQi3xBBbI2eWHI8IfHAjMhzwWghx092bH103 HDAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791373448; x=1791978248; h=content-type: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:content-type; bh=eFSHjFOLKNYfg5vGl5+rLOLoS1KQOBHgGSX+EFL2Pdg=; b=fZdUrXXBvk3HM1XzKfPNOH7IOUjLuovOeb6MvOU5BMnjVzARlEDeDyMJAUJd0rBp2L RWBKoS7p6igMWzrz2gyk4XpJL3DPmXiOg5GU0bUK4wDz/NJnEOoFBpgguTpPBLYlgovJ MuSr5QHYpY9oMpy0c9unbPEsMZWMEEDjtpFC8hsZb8d3FTIIzXgw09bZYqa1BTVS6TxW NbtR7CpVnInc17Lh803yU6VAT1SJ8FrFEaOjCMSXOBvwNZwlAZj/HitnBUqrVIyN69QK Y/7Hi8nnho5b/rt6XBU9mHltmc9OzFvkm93HGJQiNVHl5VN7LZnuB2vy+HpxZoLSj1tZ Mi5g== X-Forwarded-Encrypted: i=1; AKwUvByiHAr37ORJky9lmTwCVZmbP7osp8+zClToqgmSKPaYutyO/m3a+ajzfvnuEUjhzT9Ad5eEnNaACdWyQToRUybs@lists.infradead.org X-Gm-Message-State: AFq9FYKpLPAUmMJjdoazE62YT64ZKY2/hYK8GPWn4ONPKZG7seFwqQNK vBucnjMYiqBTwL53e/eL9eF1BbvXwpWgcjjtuSWfTXcytqetlBETdLhawGK8tG0YaiKcMJ642XM +qO9BUpB+lNqDkD1npowNJjEWgw== X-Received: from pjyp8.prod.google.com ([2002:a17:90a:e708:b0:3a7:ae0:3e6f]) (user=dylanbhatch job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:544b:b0:3a8:5d57:a5e7 with SMTP id 98e67ed59e1d1-3a8a0ba18dbmr1349017a91.28.1791373447919; Wed, 07 Oct 2026 04:44:07 -0700 (PDT) Date: Wed, 7 Oct 2026 11:43:35 +0000 In-Reply-To: <20261007114335.440322-1-dylanbhatch@google.com> Mime-Version: 1.0 References: <20261007114335.440322-1-dylanbhatch@google.com> X-Mailer: git-send-email 2.56.0.360.g66cac248cb-goog Message-ID: <20261007114335.440322-12-dylanbhatch@google.com> Subject: [PATCH v8 11/11] 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-20261007_044409_570285_A0DC877E X-CRM114-Status: GOOD ( 26.79 ) 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 kunwind_next_regs_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). 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. Co-developed-by: Weinan Liu 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 | 184 +++++++++++++++++++++++++++++++-- 1 file changed, 173 insertions(+), 11 deletions(-) diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c index 3ebcf8c53fb04..67f3f56fd994b 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,162 @@ 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(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 & 0xf) + return -EINVAL; + + /* + * Consume RA and FP from the stack. The frame record puts FP at a lower + * address than RA, so we read FP first. + */ + 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; + if (!get_word(&state->common, &fp)) + return -EINVAL; + 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; + } + + 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; + if (get_consume_word(&state->common, &ra)) + return -EINVAL; + 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; + } + + state->common.pc = ra; + state->common.fp = fp; + + state->source = source; + + return 0; +} + +#else /* !CONFIG_HAVE_UNWIND_KERNEL_SFRAME */ + +static __always_inline int +kunwind_next_regs_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 +418,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) { + /* 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: @@ -393,15 +562,7 @@ noinline noinstr void arch_stack_walk(stack_trace_consume_fn consume_entry, static __always_inline bool arch_reliable_kunwind_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) + if (state->unreliable) return false; return arch_kunwind_consume_entry(state, cookie); @@ -452,6 +613,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.56.0.360.g66cac248cb-goog