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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11701C83F22 for ; Thu, 17 Jul 2025 01:29:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8249A8D0006; Wed, 16 Jul 2025 21:29:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FBDB8D0001; Wed, 16 Jul 2025 21:29:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 711308D0006; Wed, 16 Jul 2025 21:29:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 5FFB98D0001 for ; Wed, 16 Jul 2025 21:29:19 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0A394140595 for ; Thu, 17 Jul 2025 01:29:19 +0000 (UTC) X-FDA: 83672023638.04.B632A91 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf02.hostedemail.com (Postfix) with ESMTP id 68F5880004 for ; Thu, 17 Jul 2025 01:29:17 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=A6MSYr5v; spf=pass (imf02.hostedemail.com: domain of rostedt@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=rostedt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752715757; a=rsa-sha256; cv=none; b=TmrBbFg1LO89JRFdjSQm0IrSW3v2TKrbtz5Q4G6/BASpSDxER03SzbplEPtUuJu9SJA5lF KRCdMXhVS2gKYfP/B2xf7vmX70XJFJ7ZE+EloGIlbEmQROQVPVvhZrhw+ZBSAEKuZWc8+o sBoixsrjTbUHsAkKJiaRA45AM6+iGVY= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=A6MSYr5v; spf=pass (imf02.hostedemail.com: domain of rostedt@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=rostedt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752715757; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:references:dkim-signature; bh=t4GfZYBlQMTsNk1N6CEOIpo4WljTM4o72ZeBb+6upRo=; b=ZvdWaTeSla4bd2/YFcunURE/NW+vS6Cchiu/2Q2IJKeubrQsK5F4oUys50+uv0p6HaDeSY TdkJowJOs4t0xP6KW6EiPLmf6RJfAJ7nExhkuBYcphM4VKxVNZiRJ4TaAEKjR8pNg/oWOq xEYm+82lBuB8VKQMBsFaqFg+NXUUUNI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 0076B469EB; Thu, 17 Jul 2025 01:29:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDAA4C4CEF0; Thu, 17 Jul 2025 01:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752715755; bh=vrk74lb0dbKscq8FL04HpWM1hSFFbh97X1kJjRZQ/GY=; h=Date:From:To:Cc:Subject:References:From; b=A6MSYr5vwJd+uSkbiw6tyPgL1CoiaFGT+3OgJTp0CEHgHtQmsTZH7reqvKcqdRp7G 1Tixacdxf5B49wiUN/NwlI1lowcFUrDFmwFVp3HhDYcHmZhBEZn4bzdVuGZPRMrSaA jJoAxY7iNIZDqM56/pmWTCdSJMjNPdKJtbJokWckHdXOZrlI+x+c2YhsaOzIJORAOu Q+wH6fpkJTgjSqluO5XBQuseYtGFH9/uHWDAMdmgFhDX4WXIbJyzRq3prYks/LVsAA CgrO9c2l0CqE8jXbSMRnf+7kRRxC8q3D80AyCMn6Gri9vSPkjHk8qre2Tew24dK2PS 34hI+uibPXVxA== Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1ucDRI-000000068vF-0Qay; Wed, 16 Jul 2025 21:29:36 -0400 Message-ID: <20250717012935.954474333@kernel.org> User-Agent: quilt/0.68 Date: Wed, 16 Jul 2025 21:28:50 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org, x86@kernel.org Cc: Masami Hiramatsu , Mathieu Desnoyers , Josh Poimboeuf , Peter Zijlstra , Ingo Molnar , Jiri Olsa , Namhyung Kim , Thomas Gleixner , Andrii Nakryiko , Indu Bhagat , "Jose E. Marchesi" , Beau Belgrave , Jens Remus , Linus Torvalds , Andrew Morton , Jens Axboe , Florian Weimer , Sam James , linux-mm@kvack.org Subject: [PATCH v9 02/11] unwind_user/sframe: Store sframe section data in per-mm maple tree References: <20250717012848.927473176@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 68F5880004 X-Stat-Signature: 3fx4dgnj7rfmxfwyibdqyezhxiogf9cm X-HE-Tag: 1752715757-506936 X-HE-Meta: U2FsdGVkX1/MqibWf7m0zkB1Zxtg5V+cs1TsHYfKiWUjxki1wtJ/b3HWzoB3wKbH0y/3kBUY31G5Dg/qwiQb3K4r/iH5nNdj5HDUBO3B296Dq4rFYK8wvhowWQAIECpFnLPG3PSQ6YCdmAeWgoctOUgF+v+3QWNqrM66tFRGpXMVLE0aXEyHtCktAlPyMjJ6tzMYXyf//QiBY/sEog/pwQO8WjOJA/gMRDv2mI8CQoBmhuudqKMmVVYpcyoCjDp+EYNmMZY6KII0ohvFJjh2GR9jYmZXzneA0le1sXE1QkMNit2MfOuLQQttiumwgGrS4//rFddHYBlkua9n9qQ85KbCwyJmTkxss4k3TYYWUdrSe3oS6WT+/YEZMqqPoQr0j1ZBYvxwoUVfNQaGCdiR7TgxIim/1M5kZCvPqtv6UccZwxtRhOKr9m9B7/QRUlyu31TfRwy/LAzK3iDznGaWAmjwloBalHpbjoTZXDHUY5vmNjlxvUkMee2ljbxryv6A4r1Te8RfcdwWhenTFzC2VRh1s14hnFX5n4KDOBsS89rMqnyi0y+5javgMyUjfMFerU5U8fNrzUNaP23/n2WsK2h3AITazhIJo60rpbFET/IWsWWgfHKBdHhNRKg9/xOEMz0kB3KQ09xC+nLNw2F1y5zSLke6NuKe3H9rrjBuQZQE1S2t9/Z1ohBrKfGpdE/2NG3pHet11zeHqMw2Ad7vTr+eYeNmTUna1wF+gxWU8IjMX9BpphnggV8gx4Dvfxy39sjgHeX6jBFMo+WJbCujfsDerDWVs1vZ0bq+9Q2JEX6kht7+jlQM5qRYMBFSupYAdM9cHk6h/AMV/M76beppvU4LxQaC1Ol8w4/4EA3p1eiVxMJAXRBCm8r0NI8+DsK/mFPOtytNjE5KRIfyvWKvw6zAAIAfnX3k0zBPCqbH1TYSHoY1r9DFq1fcf5xxf9jXuT1EUBruR6ohFKQtdXE Y6MX+yRL d8zQW/dkubI0qEp4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Josh Poimboeuf Associate an sframe section with its mm by adding it to a per-mm maple tree which is indexed by the corresponding text address range. A single sframe section can be associated with multiple text ranges. Cc: linux-mm@kvack.org Signed-off-by: Josh Poimboeuf Signed-off-by: Steven Rostedt (Google) --- arch/x86/include/asm/mmu.h | 2 +- include/linux/mm_types.h | 3 +++ include/linux/sframe.h | 13 +++++++++ kernel/fork.c | 10 +++++++ kernel/unwind/sframe.c | 55 +++++++++++++++++++++++++++++++++++--- mm/init-mm.c | 2 ++ 6 files changed, 81 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h index 0fe9c569d171..227a32899a59 100644 --- a/arch/x86/include/asm/mmu.h +++ b/arch/x86/include/asm/mmu.h @@ -87,7 +87,7 @@ typedef struct { .context = { \ .ctx_id = 1, \ .lock = __MUTEX_INITIALIZER(mm.context.lock), \ - } + }, void leave_mm(void); #define leave_mm leave_mm diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index d6b91e8a66d6..4296cabf4afa 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1206,6 +1206,9 @@ struct mm_struct { #ifdef CONFIG_MM_ID mm_id_t mm_id; #endif /* CONFIG_MM_ID */ +#ifdef CONFIG_HAVE_UNWIND_USER_SFRAME + struct maple_tree sframe_mt; +#endif } __randomize_layout; /* diff --git a/include/linux/sframe.h b/include/linux/sframe.h index 0584f661f698..73bf6f0b30c2 100644 --- a/include/linux/sframe.h +++ b/include/linux/sframe.h @@ -22,18 +22,31 @@ struct sframe_section { signed char fp_off; }; +#define INIT_MM_SFRAME .sframe_mt = MTREE_INIT(sframe_mt, 0), +extern void sframe_free_mm(struct mm_struct *mm); + extern int sframe_add_section(unsigned long sframe_start, unsigned long sframe_end, unsigned long text_start, unsigned long text_end); extern int sframe_remove_section(unsigned long sframe_addr); +static inline bool current_has_sframe(void) +{ + struct mm_struct *mm = current->mm; + + return mm && !mtree_empty(&mm->sframe_mt); +} + #else /* !CONFIG_HAVE_UNWIND_USER_SFRAME */ +#define INIT_MM_SFRAME +static inline void sframe_free_mm(struct mm_struct *mm) {} static inline int sframe_add_section(unsigned long sframe_start, unsigned long sframe_end, unsigned long text_start, unsigned long text_end) { return -ENOSYS; } static inline int sframe_remove_section(unsigned long sframe_addr) { return -ENOSYS; } +static inline bool current_has_sframe(void) { return false; } #endif /* CONFIG_HAVE_UNWIND_USER_SFRAME */ diff --git a/kernel/fork.c b/kernel/fork.c index 3341d50c61f2..e56daf4e546f 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -106,6 +106,7 @@ #include #include #include +#include #include #include @@ -687,6 +688,7 @@ void __mmdrop(struct mm_struct *mm) mm_pasid_drop(mm); mm_destroy_cid(mm); percpu_counter_destroy_many(mm->rss_stat, NR_MM_COUNTERS); + sframe_free_mm(mm); free_mm(mm); } @@ -1024,6 +1026,13 @@ static void mmap_init_lock(struct mm_struct *mm) #endif } +static void mm_init_sframe(struct mm_struct *mm) +{ +#ifdef CONFIG_HAVE_UNWIND_USER_SFRAME + mt_init(&mm->sframe_mt); +#endif +} + static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p, struct user_namespace *user_ns) { @@ -1053,6 +1062,7 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p, mm->pmd_huge_pte = NULL; #endif mm_init_uprobes_state(mm); + mm_init_sframe(mm); hugetlb_count_init(mm); if (current->mm) { diff --git a/kernel/unwind/sframe.c b/kernel/unwind/sframe.c index 20287f795b36..fa7d87ffd00a 100644 --- a/kernel/unwind/sframe.c +++ b/kernel/unwind/sframe.c @@ -122,15 +122,64 @@ int sframe_add_section(unsigned long sframe_start, unsigned long sframe_end, if (ret) goto err_free; - /* TODO nowhere to store it yet - just free it and return an error */ - ret = -ENOSYS; + ret = mtree_insert_range(sframe_mt, sec->text_start, sec->text_end, sec, GFP_KERNEL); + if (ret) { + dbg("mtree_insert_range failed: text=%lx-%lx\n", + sec->text_start, sec->text_end); + goto err_free; + } + + return 0; err_free: free_section(sec); return ret; } +static int __sframe_remove_section(struct mm_struct *mm, + struct sframe_section *sec) +{ + if (!mtree_erase(&mm->sframe_mt, sec->text_start)) { + dbg("mtree_erase failed: text=%lx\n", sec->text_start); + return -EINVAL; + } + + free_section(sec); + + return 0; +} + int sframe_remove_section(unsigned long sframe_start) { - return -ENOSYS; + struct mm_struct *mm = current->mm; + struct sframe_section *sec; + unsigned long index = 0; + bool found = false; + int ret = 0; + + mt_for_each(&mm->sframe_mt, sec, index, ULONG_MAX) { + if (sec->sframe_start == sframe_start) { + found = true; + ret |= __sframe_remove_section(mm, sec); + } + } + + if (!found || ret) + return -EINVAL; + + return 0; +} + +void sframe_free_mm(struct mm_struct *mm) +{ + struct sframe_section *sec; + unsigned long index = 0; + + if (!mm) + return; + + mt_for_each(&mm->sframe_mt, sec, index, ULONG_MAX) + free_section(sec); + + mtree_destroy(&mm->sframe_mt); } diff --git a/mm/init-mm.c b/mm/init-mm.c index 4600e7605cab..b32fcf167cc2 100644 --- a/mm/init-mm.c +++ b/mm/init-mm.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #ifndef INIT_MM_CONTEXT @@ -46,6 +47,7 @@ struct mm_struct init_mm = { .user_ns = &init_user_ns, .cpu_bitmap = CPU_BITS_NONE, INIT_MM_CONTEXT(init_mm) + INIT_MM_SFRAME }; void setup_initial_init_mm(void *start_code, void *end_code, -- 2.47.2