From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F9D1396B69 for ; Mon, 6 Apr 2026 18:50:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775501432; cv=none; b=pZ5If1mOZES6P75gLDM4lUTmmpJWtPAy8mJ8ZglLAHz2Ym7GXnRcBIc8dEec4KdNrR/rarWw56W1GHyptd8N1Lnu0iz9/6ey89I4lOiXtXDvGYYzF1lmQvb0YqdexcVJLY1DGVg5ipdOTUC6Fb7b17DuMNYEQoxCFeqMuBuiChg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775501432; c=relaxed/simple; bh=dqzZzfSk8bT1Zi1G9izPmtih5cUu0n+nhrzQ2I/IFpA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WVIpWM7ubU+Kc5jR5pkaVR0Yu5DpMfCQC0+JeSdKaW2qpzqVxd1LcaCmPS2iy06h/InqGLOA783QkZrT2OdRDL98Xd9dsyc8lmQ21aMpbTRrZRWbU2PHLOrRY7ARPzbSHXCz7VBOgMDsod8hFvSLOeyFAvdBTQQiJguuIWIqmBw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--dylanbhatch.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=gGydB3jz; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--dylanbhatch.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gGydB3jz" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-82c6929bd26so5465502b3a.3 for ; Mon, 06 Apr 2026 11:50:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775501431; x=1776106231; darn=vger.kernel.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=Yhzt+2m7KvQldPypN2XKP0c6VTxJwPXKSi6TvYWyEKw=; b=gGydB3jzpUoYtWr8tT2HdODRmpoeN7NeVKkhYXeSAQfIurDsglLkfPzfNYwUWkiNjP lRQPWq39vd3nJ+w+Np6AwyQ7NJNxnDbLSVYqk02viFZLK8a0cUdUZombqiflS2oWQJeI v8+32CZb9vXvsqZZpHZ7VvakPyArqHEg8gEb9i3Fp7tFYC5DB1fyqjkR3LHrwF+M+/hc wqfFjsd4ukLLDjHiuLL3weP1E6g7n7ndlg1lDP5I82oc10/BSupkvk51YYeUhjfz32Nv iQ8ossIb22rlFDjqaGG0JS4DNodEc3YvpoucMtiXr3uYEdLDkFHGVHiQ3MENdNzBq+El fm7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775501431; x=1776106231; 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=Yhzt+2m7KvQldPypN2XKP0c6VTxJwPXKSi6TvYWyEKw=; b=gDL29HI3wRQSWfLIyhKIWgwy+To7BUHUloM6HBmjUzA4t5BGNJuOyOu/PmYjc/NcG6 5WvcxThFfyqiK4agiiI+UfVtHNao0x5xkzy6sfE6kivbxeyz92Vs91bIvwD6RpVEIMI6 KqBx5DdtqXT9xGfm3J4XDKhK3FkMsheXBtkJbOOnr7TkiwMDQxPYQaou9z7KFOjxb5qG GFRTF1HfMlVUI2xOE591tb5H0bAGlsBcmweweMpcA+txX1jHoecpXAt4Azkcjnp4tWxa F7E1ep6VFHLUQt9PCSJTMROHN88dD4Q+vuYLXVfYunII8dg5dXy3tcoCHZvBUXvPkmeu avmw== X-Forwarded-Encrypted: i=1; AJvYcCX0XzYMQ4fUsU2dYweiUHSFaGsqDuFkAbdiQLE9EgsXG4EQAPXweQYoKK1EfAkExmnpZB4s5r0hxW42/SNVYCEu@vger.kernel.org X-Gm-Message-State: AOJu0Yyus5in6HfTK8TtE+0ge5SETIEODeZWZDj3lfBYDMt/x0XGLSOB 1C/aQVI4uTZJgk6S33sWAYzhsEpbIFdL1DUPhyXjKMDxVAomXwUObGJxYKPpkUJTrFGshFW9uIA qSgVM7PXFXAyaUk57vS1+dPxvYA== X-Received: from pfmu23.prod.google.com ([2002:aa7:8397:0:b0:829:7ce4:7fcc]) (user=dylanbhatch job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:ab84:b0:82a:8865:6fe6 with SMTP id d2e1a72fcca58-82d0db6ab99mr12608374b3a.28.1775501430507; Mon, 06 Apr 2026 11:50:30 -0700 (PDT) Date: Mon, 6 Apr 2026 18:49:58 +0000 In-Reply-To: <20260406185000.1378082-1-dylanbhatch@google.com> Precedence: bulk X-Mailing-List: linux-toolchains@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406185000.1378082-1-dylanbhatch@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260406185000.1378082-7-dylanbhatch@google.com> Subject: [PATCH v3 6/8] arm64/module, sframe: Add sframe support for modules. From: Dylan Hatch To: Roman Gushchin , Weinan Liu , Will Deacon , Josh Poimboeuf , Indu Bhagat , Peter Zijlstra , Steven Rostedt , Catalin Marinas , Jiri Kosina Cc: Dylan Hatch , Mark Rutland , 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, Jens Remus , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" Add sframe table to mod_arch_specific and support sframe PC lookups when an .sframe section can be found on incoming modules. Signed-off-by: Dylan Hatch Signed-off-by: Weinan Liu --- arch/arm64/include/asm/module.h | 6 +++++ arch/arm64/kernel/module.c | 8 +++++++ include/linux/sframe.h | 2 ++ kernel/unwind/sframe.c | 39 +++++++++++++++++++++++++++++++-- 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h index fb9b88eebeb1..59fb6fba88d0 100644 --- a/arch/arm64/include/asm/module.h +++ b/arch/arm64/include/asm/module.h @@ -6,6 +6,7 @@ #define __ASM_MODULE_H #include +#include struct mod_plt_sec { int plt_shndx; @@ -17,6 +18,11 @@ struct mod_arch_specific { struct mod_plt_sec core; struct mod_plt_sec init; +#ifdef CONFIG_SFRAME_UNWINDER + struct sframe_section sframe_sec; + bool sframe_init; +#endif + /* for CONFIG_DYNAMIC_FTRACE */ struct plt_entry *ftrace_trampolines; struct plt_entry *init_ftrace_trampolines; diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c index 24adb581af0e..427f187e9531 100644 --- a/arch/arm64/kernel/module.c +++ b/arch/arm64/kernel/module.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -515,5 +516,12 @@ int module_finalize(const Elf_Ehdr *hdr, } } + s = find_section(hdr, sechdrs, ".sframe"); + if (s) { + struct module_memory *t = &me->mem[MOD_TEXT]; + + sframe_module_init(me, (void *)s->sh_addr, s->sh_size, + t->base, t->size); + } return module_init_ftrace_plt(hdr, sechdrs, me); } diff --git a/include/linux/sframe.h b/include/linux/sframe.h index 593b60715cd6..06fdda1dd116 100644 --- a/include/linux/sframe.h +++ b/include/linux/sframe.h @@ -121,6 +121,8 @@ extern int sframe_find_kernel(unsigned long ip, struct unwind_frame *frame); #else static inline void __init init_sframe_table(void) {} +static inline void sframe_module_init(struct module *mod, void *sframe, size_t sframe_size, + void *text, size_t text_size) {} #endif /* CONFIG_SFRAME_UNWINDER */ diff --git a/kernel/unwind/sframe.c b/kernel/unwind/sframe.c index 4dd3612f9e7a..180f64040846 100644 --- a/kernel/unwind/sframe.c +++ b/kernel/unwind/sframe.c @@ -982,10 +982,27 @@ void sframe_free_mm(struct mm_struct *mm) int sframe_find_kernel(unsigned long ip, struct unwind_frame *frame) { - if (!frame || !sframe_init) + struct sframe_section *sec; + + if (!frame) return -EINVAL; - return __sframe_find(&kernel_sfsec, ip, frame); + if (is_ksym_addr(ip)) { + if (!sframe_init) + return -EINVAL; + + sec = &kernel_sfsec; + } else { + struct module *mod; + + mod = __module_address(ip); + if (!mod || !mod->arch.sframe_init) + return -EINVAL; + + sec = &mod->arch.sframe_sec; + } + + return __sframe_find(sec, ip, frame); } void __init init_sframe_table(void) @@ -1002,4 +1019,22 @@ void __init init_sframe_table(void) sframe_init = true; } +void sframe_module_init(struct module *mod, void *sframe, size_t sframe_size, + void *text, size_t text_size) +{ + struct sframe_section sec; + + sec.sec_type = SFRAME_KERNEL; + sec.sframe_start = (unsigned long)sframe; + sec.sframe_end = (unsigned long)sframe + sframe_size; + sec.text_start = (unsigned long)text; + sec.text_end = (unsigned long)text + text_size; + + if (WARN_ON(sframe_read_header(&sec))) + return; + + mod->arch.sframe_sec = sec; + mod->arch.sframe_init = true; +} + #endif /* CONFIG_SFRAME_UNWINDER */ -- 2.53.0.1213.gd9a14994de-goog