From patchwork Mon Apr 22 09:44:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13638191 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 4DEE2C07E8F for ; Mon, 22 Apr 2024 09:47:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D542B6B0098; Mon, 22 Apr 2024 05:47:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D03C66B00D1; Mon, 22 Apr 2024 05:47:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B56A26B0099; Mon, 22 Apr 2024 05:47:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 94B916B00D1 for ; Mon, 22 Apr 2024 05:47:48 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 531C180511 for ; Mon, 22 Apr 2024 09:47:48 +0000 (UTC) X-FDA: 82036691016.28.D880603 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf02.hostedemail.com (Postfix) with ESMTP id 163F68000C for ; Mon, 22 Apr 2024 09:47:45 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=AtnRZ5ED; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713779266; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ANCyuDCQki5oUdnp4LblhMf7sZGZO99x4KDoz3BiE/U=; b=W4chRRi47MQvhmeTld9LlJdC6hUbqu5HllX9x27zX2NP4TVv8Jao5x0PycbpWX2EiMfDyM qGSLRSPpxUusgHsTVDvmqeftPjBfEd7kGyNfZWhpLicsUJwrEdDEaLzn0ojwRNwwDtmV2a TjICHg43MehUFFG60e5oQPkx9iDx3sg= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=AtnRZ5ED; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713779266; a=rsa-sha256; cv=none; b=2nCCA7gt9B/ExUGSV8BalITVMmwM/1b3+qFO9AXAXeb6l+ni3+qbDg8ObVcXOjkDGepmLF b31wa0OBLHb3qfqdqG3Wm4aftpHQMLOuYsrcUNbA5HwCLoO4/ErJbnCFL8G6ebw/SNDla1 g9kmcimRjHbbPnX0tPe7W31lOs1o1gs= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 45626CE01F6; Mon, 22 Apr 2024 09:47:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29432C4AF0D; Mon, 22 Apr 2024 09:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713779262; bh=JCH7z+KnsSjmtcm088NIvEOhuMkJJMSjjbhWn1+cIes=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AtnRZ5EDjkMP4jgAqBa0H6+pqP9H9YyjHulJhukWQJUfmeO56E/8ECz1iNFqAx6c0 7ReyaOOuu9/ryvs7a58EQklBZCOyeMVFkea4AxxSZigKZVXAC4XnTuLggFi1WO21UT 9OjJxQwj2VKxfx+D4h1eXgT05lX1+tBCkC8tJUG5yTv4Cfvmo0MZfUbRsYx9j8a6hJ htV4rD8eUDqsg/UE7G3wNpN+cF8a0wr/oY06h8N6g5974undvzv7fj2a6nSwnWI9MM OO8fKKQj2NSDaxiIp3A120/aPw36MyaDuAHzUyoAK2Y+nbE3ABn+fTf1WxzgYnk+7U DBfTTh8HCR1dw== From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Alexandre Ghiti , Andrew Morton , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Catalin Marinas , Christophe Leroy , "David S. Miller" , Dinh Nguyen , Donald Dutile , Eric Chanudet , Heiko Carstens , Helge Deller , Huacai Chen , Kent Overstreet , Luis Chamberlain , Mark Rutland , Masami Hiramatsu , Michael Ellerman , Mike Rapoport , Nadav Amit , Palmer Dabbelt , Peter Zijlstra , Rick Edgecombe , Russell King , Sam Ravnborg , Song Liu , Steven Rostedt , Thomas Bogendoerfer , Thomas Gleixner , Will Deacon , bpf@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, netdev@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org Subject: [PATCH v5 14/15] kprobes: remove dependency on CONFIG_MODULES Date: Mon, 22 Apr 2024 12:44:35 +0300 Message-ID: <20240422094436.3625171-15-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240422094436.3625171-1-rppt@kernel.org> References: <20240422094436.3625171-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 163F68000C X-Stat-Signature: ffyrpo4ofnausb16541hze9r4aiycydg X-HE-Tag: 1713779265-307088 X-HE-Meta: U2FsdGVkX1/GOVj8ZlTsz9R1Tnxnmh1QNxurHK7ZZj9RMLYHA3HyLrzJTkpsJXRtCVeV2pfOZYJUKqOFmMaL7U249jfvR/VqF8C0yOndMTK4AgpIvkQJiBmzU50HIuokIjegvwtJZhmNphEtNDcE2eQ43q1gg+EefjJoCONfiWB9Ld+OrX9fvcTjtQMCzO7jz4S5ToqZWBGbnWOpbX4ZdIg/3VDuSWnBOiVqMaf3z1PuevONhqrQXsweQkunW3P9ZWfULVkWtpZGoc0Qg792ewf0ALgqRe2SeT9yQp1WxayWiACwtTdRcORld1avCD11dwVw+4xi1MrlMoXGuTBzn2fADpw2k/emhoH3CZTydPmmvbpVqh+OxFVMrfempDCypzYi0aC36IjwFaAl1YohEdiPULH0ySYPpC92Bh5MSZt9bqMDEp2BTki2pwv4D9FKV3rpZjKJLszuIkKb5xP1lGU60WSfE3lrtScxdJQD/29DpSMU11gyKXif2AEKtHMwnTcFnnbcPzhGUPG47Ek+dF0UB8FhGjTasP780LuHrr5V+3uFru5ghAM07kcPRYwTDVE6rOtPvz7rKNS87q18fVJ2Pmjjo1b8Uk5ulcu46Wo+2MzZRbFYx8D2RfhyNtEWJRjpvquSTjjIOiXeETV/p2nxAPjUqrJy4woFNY8cTfMn3m+WbU8f44PSQ8SLyFVjZOd1JKwcE2KO3o+ZYpDTjv9ZwfAIvmYRDHabbaj48ipvDPyD7W/jZ/MaMmpIiHz3J3eLHFXRhSWGWRiss6H0lDPSt4rYKTqQyelOl8mQCMSTj3rnUB9GAy1O1w9VwKbRi4V0+g/ONUFFCpFZqaIgLQLf3teYOS70A9gEUGYdNyyfVWFN6FE4lDGHLO8wJyMTXog1NZ79iRm9MMISvZ6JodnmAAAH0IKxOnWjlIc3ih8MCJH7h4CJOYflMM0JNTJUqjBmFScOxm1CYvBj4/p glqSauLW icgvv27IiLg9yq1TKwm8o2tYOysj/mwEvrvoOmcohdpBSXDXHV638M/G2WUupAmR/lOOPpiK10E+v1VHXKX/Tzc5QAZlNge4ywC22xMa77JdO+a7RQASzoRyaZHzYuIrRlnFRF9ZcFQGJxgI8CnFXbYpuIAm/W9B8vHgCHwUvUNFD/MI89sAwXAq+oi3IqJWu6ZByEyffqSGiTPTaU2weOPGUueVNZnbTa0fcBqiF5gOraeFZwG90qKza/+UoSP/dY62l5Nm3xnB6olG7sSjwtmxidN5J6WyV7sML2dZo+B8p+l4J91Mfp0pDfGqsSTUZMgCSwl1U3U8WK9LpNp/mDYU5cZeCW6XfqH3xoTdNbveUE0k= 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: "Mike Rapoport (IBM)" kprobes depended on CONFIG_MODULES because it has to allocate memory for code. Since code allocations are now implemented with execmem, kprobes can be enabled in non-modular kernels. Add #ifdef CONFIG_MODULE guards for the code dealing with kprobes inside modules, make CONFIG_KPROBES select CONFIG_EXECMEM and drop the dependency of CONFIG_KPROBES on CONFIG_MODULES. Signed-off-by: Mike Rapoport (IBM) Acked-by: Masami Hiramatsu (Google) --- arch/Kconfig | 2 +- include/linux/module.h | 9 ++++++ kernel/kprobes.c | 55 +++++++++++++++++++++++-------------- kernel/trace/trace_kprobe.c | 20 +++++++++++++- 4 files changed, 63 insertions(+), 23 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 7006f71f0110..a48ce6a488b3 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -52,9 +52,9 @@ config GENERIC_ENTRY config KPROBES bool "Kprobes" - depends on MODULES depends on HAVE_KPROBES select KALLSYMS + select EXECMEM select TASKS_RCU if PREEMPTION help Kprobes allows you to trap at almost any kernel address and diff --git a/include/linux/module.h b/include/linux/module.h index 1153b0d99a80..ffa1c603163c 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -605,6 +605,11 @@ static inline bool module_is_live(struct module *mod) return mod->state != MODULE_STATE_GOING; } +static inline bool module_is_coming(struct module *mod) +{ + return mod->state == MODULE_STATE_COMING; +} + struct module *__module_text_address(unsigned long addr); struct module *__module_address(unsigned long addr); bool is_module_address(unsigned long addr); @@ -857,6 +862,10 @@ void *dereference_module_function_descriptor(struct module *mod, void *ptr) return ptr; } +static inline bool module_is_coming(struct module *mod) +{ + return false; +} #endif /* CONFIG_MODULES */ #ifdef CONFIG_SYSFS diff --git a/kernel/kprobes.c b/kernel/kprobes.c index ddd7cdc16edf..ca2c6cbd42d2 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1588,7 +1588,7 @@ static int check_kprobe_address_safe(struct kprobe *p, } /* Get module refcount and reject __init functions for loaded modules. */ - if (*probed_mod) { + if (IS_ENABLED(CONFIG_MODULES) && *probed_mod) { /* * We must hold a refcount of the probed module while updating * its code to prohibit unexpected unloading. @@ -1603,12 +1603,13 @@ static int check_kprobe_address_safe(struct kprobe *p, * kprobes in there. */ if (within_module_init((unsigned long)p->addr, *probed_mod) && - (*probed_mod)->state != MODULE_STATE_COMING) { + !module_is_coming(*probed_mod)) { module_put(*probed_mod); *probed_mod = NULL; ret = -ENOENT; } } + out: preempt_enable(); jump_label_unlock(); @@ -2488,24 +2489,6 @@ int kprobe_add_area_blacklist(unsigned long start, unsigned long end) return 0; } -/* Remove all symbols in given area from kprobe blacklist */ -static void kprobe_remove_area_blacklist(unsigned long start, unsigned long end) -{ - struct kprobe_blacklist_entry *ent, *n; - - list_for_each_entry_safe(ent, n, &kprobe_blacklist, list) { - if (ent->start_addr < start || ent->start_addr >= end) - continue; - list_del(&ent->list); - kfree(ent); - } -} - -static void kprobe_remove_ksym_blacklist(unsigned long entry) -{ - kprobe_remove_area_blacklist(entry, entry + 1); -} - int __weak arch_kprobe_get_kallsym(unsigned int *symnum, unsigned long *value, char *type, char *sym) { @@ -2570,6 +2553,25 @@ static int __init populate_kprobe_blacklist(unsigned long *start, return ret ? : arch_populate_kprobe_blacklist(); } +#ifdef CONFIG_MODULES +/* Remove all symbols in given area from kprobe blacklist */ +static void kprobe_remove_area_blacklist(unsigned long start, unsigned long end) +{ + struct kprobe_blacklist_entry *ent, *n; + + list_for_each_entry_safe(ent, n, &kprobe_blacklist, list) { + if (ent->start_addr < start || ent->start_addr >= end) + continue; + list_del(&ent->list); + kfree(ent); + } +} + +static void kprobe_remove_ksym_blacklist(unsigned long entry) +{ + kprobe_remove_area_blacklist(entry, entry + 1); +} + static void add_module_kprobe_blacklist(struct module *mod) { unsigned long start, end; @@ -2672,6 +2674,17 @@ static struct notifier_block kprobe_module_nb = { .priority = 0 }; +static int kprobe_register_module_notifier(void) +{ + return register_module_notifier(&kprobe_module_nb); +} +#else +static int kprobe_register_module_notifier(void) +{ + return 0; +} +#endif /* CONFIG_MODULES */ + void kprobe_free_init_mem(void) { void *start = (void *)(&__init_begin); @@ -2731,7 +2744,7 @@ static int __init init_kprobes(void) if (!err) err = register_die_notifier(&kprobe_exceptions_nb); if (!err) - err = register_module_notifier(&kprobe_module_nb); + err = kprobe_register_module_notifier(); kprobes_initialized = (err == 0); kprobe_sysctls_init(); diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 14099cc17fc9..2cb2a3951b4f 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -111,6 +111,7 @@ static nokprobe_inline bool trace_kprobe_within_module(struct trace_kprobe *tk, return strncmp(module_name(mod), name, len) == 0 && name[len] == ':'; } +#ifdef CONFIG_MODULES static nokprobe_inline bool trace_kprobe_module_exist(struct trace_kprobe *tk) { char *p; @@ -129,6 +130,12 @@ static nokprobe_inline bool trace_kprobe_module_exist(struct trace_kprobe *tk) return ret; } +#else +static inline bool trace_kprobe_module_exist(struct trace_kprobe *tk) +{ + return false; +} +#endif static bool trace_kprobe_is_busy(struct dyn_event *ev) { @@ -670,6 +677,7 @@ static int register_trace_kprobe(struct trace_kprobe *tk) return ret; } +#ifdef CONFIG_MODULES /* Module notifier call back, checking event on the module */ static int trace_kprobe_module_callback(struct notifier_block *nb, unsigned long val, void *data) @@ -704,6 +712,16 @@ static struct notifier_block trace_kprobe_module_nb = { .notifier_call = trace_kprobe_module_callback, .priority = 1 /* Invoked after kprobe module callback */ }; +static int trace_kprobe_register_module_notifier(void) +{ + return register_module_notifier(&trace_kprobe_module_nb); +} +#else +static int trace_kprobe_register_module_notifier(void) +{ + return 0; +} +#endif /* CONFIG_MODULES */ static int count_symbols(void *data, unsigned long unused) { @@ -1933,7 +1951,7 @@ static __init int init_kprobe_trace_early(void) if (ret) return ret; - if (register_module_notifier(&trace_kprobe_module_nb)) + if (trace_kprobe_register_module_notifier()) return -EINVAL; return 0;