From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 4791747B408 for ; Tue, 28 Apr 2026 18:37:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777401447; cv=none; b=TiKLdj081SrFlBiFOk5pMIcWK0u2MjwAy3H1FU83k9labbVrf4Qs/7ZM6KLme8inPeQSi1exWcHaY086jbXYGVyMdjPtH8908XwFHsHkLB8tIsMT3deJ24pNZslpYmyKlYuAznwNpBl/3e8Xwc2Ol4f68HX3XoS0g4uxun9vnl4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777401447; c=relaxed/simple; bh=VU/AUcZ1EaUk6V/EpDZo4mcmhiF2Ge8dGm5Jwl/Qplw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Pe4a/Le7cGcBvo0qHbkPfVwzO7KrWr+I25K7mZxGXQeISWSDxCjEilJWz5t/ukyiESsWuO+RH9YxuUoRotXoBCXKagfdjDqNa3LfsX32QWGOzOO7sGSvVPrE9VWI5oNN3QHjS08frtJiLPNIBu+VBhkDCcBHgoKXOVXROTLx+Qc= 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=dBOUo4oH; arc=none smtp.client-ip=209.85.214.202 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="dBOUo4oH" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2b24af7ca99so160300055ad.1 for ; Tue, 28 Apr 2026 11:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777401446; x=1778006246; 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=M7EyQfNtegfTWEfYy8kG9xX+fYrEWmDcicnmg1Ulors=; b=dBOUo4oHYE93I9Lvkkoi0jRWP3BrC2uBsU4+R3xwErIwl6rzl02duWiAfEaaoCVY01 bH7dQ616qBGVzMAJUElNLC0xxjtlzRXJEqMJHyVBpRG1qEKhm1tR4XrWdMQA1xcB9qF/ IFu01l1N/MoaJVSYvHKyoW422v4ZtuTA6Wfd1G+GHpOsltIX+xd2WqEHNH7/DPzt9cwC NgOiWWk54EWxe0kC9qrZZOK+J6pP1uc0vjHSa/HIsxl+4ihtfutPSyuzmCZgqlsKuHDr peKpe1ST94TvIUOhk7vESFjM0+lQqPUmX8hcv5P20TvRe4/2OoB7nv3NVcaeepgQC8Q6 QXwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777401446; x=1778006246; 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=M7EyQfNtegfTWEfYy8kG9xX+fYrEWmDcicnmg1Ulors=; b=fLIYfsVQ4HcWdGRtOXEtqv7W1EwuF6jUVHTCvWo/Xli+A2usU60yi6Jnh2JmDKr5WT gLy2ksltTjp+8MlJWHBa5FJ+8c0g0lO1xBoCtqJpTvyERo1XGZCne14iO6WDUJSiIkf8 f3KUnuGjmPCaFaoKcGCkf/ugqLpXf/ciFXbkd1o/fFzHC5CwLP3zfIpJpc2XYHu51Wk/ UZxd6qgbR/zyA5Guq4Wzxe7zWIGJGAcAmqh3UdC39AZaYMONICykle/XmMI3jy4G0qhA +7YIZgrwXjENvipPD+/J7vI1PwUtH/KZl7YauXtJsCnZvBrzRX5q1R9zVHx+Kc7iFFhw guVA== X-Forwarded-Encrypted: i=1; AFNElJ8EMxlBuWDj5lcZIxgl7hoX2/OBuVs0HyNjySnXNCcC6dMYF6aU5pPU51qrhPwLQQPr0PuMrNiAlL1GOKo=@vger.kernel.org X-Gm-Message-State: AOJu0YxfVIuhK7Z37zXUaNcx9cU6RKWgQ4hLg/brXvZyVE4aF4Mlb/Yq ajjAev9HItoNhGUabNUofOpbUdaBoOra5pt0uBicuzi8/dIP+ax01sSL80y/lNCy11aH53RqAgV 3un2t6oVpCQSOgXxUZYAsaVo/HA== X-Received: from pgbdp11.prod.google.com ([2002:a05:6a02:f0b:b0:c6d:caaa:3364]) (user=dylanbhatch job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:7286:b0:3a2:d629:16a2 with SMTP id adf61e73a8af0-3a39bfc6a83mr4727109637.10.1777401445332; Tue, 28 Apr 2026 11:37:25 -0700 (PDT) Date: Tue, 28 Apr 2026 18:36:41 +0000 In-Reply-To: <20260428183643.3796063-1-dylanbhatch@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260428183643.3796063-1-dylanbhatch@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260428183643.3796063-7-dylanbhatch@google.com> Subject: [PATCH v5 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 , Jens Remus 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, linux-arm-kernel@lists.infradead.org, Randy Dunlap 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: Weinan Liu Reviewed-by: Jens Remus Signed-off-by: Dylan Hatch --- arch/arm64/include/asm/module.h | 6 +++++ arch/arm64/kernel/module.c | 8 +++++++ include/linux/sframe.h | 2 ++ kernel/unwind/sframe.c | 40 +++++++++++++++++++++++++++++++-- 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h index fb9b88eebeb1..07f309c51eee 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_HAVE_UNWIND_KERNEL_SFRAME + 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 8ae31ed36226..27f5a66190af 100644 --- a/include/linux/sframe.h +++ b/include/linux/sframe.h @@ -81,6 +81,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_HAVE_UNWIND_KERNEL_SFRAME */ diff --git a/kernel/unwind/sframe.c b/kernel/unwind/sframe.c index dcf4deb378dc..70001c8e586d 100644 --- a/kernel/unwind/sframe.c +++ b/kernel/unwind/sframe.c @@ -980,10 +980,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) @@ -1000,4 +1017,23 @@ 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; + + memset(&sec, 0, sizeof(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_HAVE_UNWIND_KERNEL_SFRAME */ -- 2.54.0.545.g6539524ca2-goog