From patchwork Mon Apr 29 12:16:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13646783 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 D86B7C4345F for ; Mon, 29 Apr 2024 12:19:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D5F46B009C; Mon, 29 Apr 2024 08:19:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 686C26B009D; Mon, 29 Apr 2024 08:19:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 526B96B009E; Mon, 29 Apr 2024 08:19:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 332396B009C for ; Mon, 29 Apr 2024 08:19:37 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4C2ACA2CFC for ; Mon, 29 Apr 2024 12:19:35 +0000 (UTC) X-FDA: 82062475110.23.0CF9483 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf16.hostedemail.com (Postfix) with ESMTP id 2BA4718002C for ; Mon, 29 Apr 2024 12:19:32 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=bFFsInVF; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.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=1714393173; 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=G1rQtiWFoR5W1h5nPiRt+y1DO9ebTEsc0kroLYKNNR8=; b=2YkSmKWydzh+LYhGXANx54waOQ2EHrW682Sg5MEGXqOim2MTm2X0W8xEZlWkwUwhdPoukH HHX9vfPHidOEG5NKlD0pgct6jS62RWqNkWU+NAcIyyXfkYJGiunA3UCyQzGl6bukOlV2AX 6I1/AOPi7yeSZ6xdj6bmXCGQidZJGlA= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=bFFsInVF; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.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=1714393173; a=rsa-sha256; cv=none; b=gRvFTkJz9l/RmzYdOCiwWooRMGGQNHzzdHl891x2BhP45vmXEEHRqpKjWOMHlUtePficy0 2ZpZUF+y0kRKQlt+BY4EDF5XiL76O9M3XL7jUd1jrtdv2FEtVhFcDIHzy1A8OpaefTRJo4 CY8/cFtDtET095wePYzTIVUhXPSj9uc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 0D5F5CE0A4E; Mon, 29 Apr 2024 12:19:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72204C4AF17; Mon, 29 Apr 2024 12:19:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714393169; bh=n6mgI0H/39mvE4gYkoCj3q2CT30/D9BQcnyPUkYmzdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bFFsInVFBMWcUy2hMTUt+adbc6np/tPcr9VGkWm8tuP6NytnXv1QlQsi/5luT78pd Gwkji8MgXhvAgn2blsfXUmT7xgHCZqJeFjNqaPNe0IjaM1QgosAmZkHxe4k2lFiWKL D2u8d3TVvOd0XmRy1ID5ZmOOgXPFLBbkHIY8uowOvfpmryc5HK4vjLM6dZ5/gp4jQW e2UivEzHHY3tOquEc+6zwZUIJdtVLpkuY0CYRFyyK/60HSJiGPdesQxLZLuDUS0Jps wHm1nIGgjwqXKqgu2gD18X1d3gf5+T3g4JnHEY7R+bSyi8BvcfNzCcvUPaCGFrLtdr 5p2A448+R1sCQ== 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 , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , 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 v7 15/16] kprobes: remove dependency on CONFIG_MODULES Date: Mon, 29 Apr 2024 15:16:19 +0300 Message-ID: <20240429121620.1186447-16-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240429121620.1186447-1-rppt@kernel.org> References: <20240429121620.1186447-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Stat-Signature: zefrfyf3p53rgt1f95e4uddcs7uifdiu X-Rspam-User: X-Rspamd-Queue-Id: 2BA4718002C X-HE-Tag: 1714393172-215121 X-HE-Meta: U2FsdGVkX1995J2kzJuHTQ/sIj7t2k7Ar2yxmID9bTiMweO71cnhFEuBnOwMVq0cGzuHgezcIMgFva+y/bcVYkefEZYLR48Ek/X6WuADLMn/uJz0emro/R/Q9wtBDrK+92m2P+OqprVRDdFACPhbgv9JvpQ7y6cG4eXNHVY/yj7vntQ7+zdSTw32dkUyvY2SGAiVXkKAfpG2dltcGGDNvwdTC2xyzsqxoMEpAm0BrCpOkxCQm35QQG8MOsm8LJxr9vTR0nhNSxzaxw6Hrl1PF4JF40DXxoobM965KaJNNc/MhrgTkhDg6RNRTJqYo4Prr+449fnOjpw1a4WoUtFB39CGPdTgABovCITSUen+/qqVjTaNQ7eERh8tKytp7I+V4jUR73VBZexHjPB0laIpCgOKk7imxl1XClTwdKiz/T6SzjYuwJ4Ss3qvUGnHb16HWoXehJXfG6x/LK6HivM8V2Ix1L++0lvlkyBlUej/oX/cFxVcKxUwnpWoBrV/mz5vk+0wUTp07G6exBlzhV93HXg/uqn4oNe1Gq0fUK2xXjZ72t4mKoQ/Shgj7LY2qIzL+OJHyybJzKQhijLrIr2Zqck9ECWt/839FRW3HPsEJZRT1bVtsyTr1UA+6xuzEY1Ha9bVqAAkj87AfAJWuTflHdp/3Sa1dXyzGjmfrk/nXaHgpXmHduX4nf/vvzba2+gzacUFUIyAUpfL7pgPOEe/62gAzwEiFIf9k2QsJeuNrs48EvOACHZQ2YseoPuC+6RTJ6QAcvoqOqu3snSqlK5rnpYne5TooIVxP1Vt1mbLj4fQL26jdl6u2XF1qgzK2ytmmHqXvDYO08lKUFf8JzvK86tSGs6z2mT2JiBcK3k6MG1fxW/uTA987HCL5PP8KIoKGaWM52jU0LnBg+0Ury5OEnsuyUVPZiO4kCBHnM83EcVOJnxBGV77+VkY/ltPEeD9IOQPchbUHmcoPRUVC3+ SVS+Qpze Fg0hiKnf/V7YaWGW1LHSlRHfgNwt6zMh5q7t+LOSNGqncVn2zELx+E+viFiV/U6Bgjb5QXk/Gj1pACCMZu/VB9QNSeKkAXJlTn13/nG714lkukI/jgazRT0lsZzThn3ockPsgVjofGpKfLV/hiACvrUWsxA== 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 4fd0daa54e6c..caa459964f09 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;