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 8F117C4345F for ; Wed, 17 Apr 2024 21:16:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A3B06B008C; Wed, 17 Apr 2024 17:16:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 02C3F6B0092; Wed, 17 Apr 2024 17:16:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE7D36B0093; Wed, 17 Apr 2024 17:16:30 -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 BA64F6B008C for ; Wed, 17 Apr 2024 17:16:30 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 672231A0FB6 for ; Wed, 17 Apr 2024 21:16:30 +0000 (UTC) X-FDA: 82020282540.22.01E7D5A Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by imf01.hostedemail.com (Postfix) with ESMTP id 76E7640003 for ; Wed, 17 Apr 2024 21:16:28 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="BA7B/zyS"; spf=pass (imf01.hostedemail.com: domain of masami.hiramatsu@gmail.com designates 209.85.210.169 as permitted sender) smtp.mailfrom=masami.hiramatsu@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713388588; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=bn6gtyCUSwijw+6XX0qI9C//f05i55ZPnAFUJjnUL90=; b=xah76Uh/AbwV9tizsHnG7oKbXt0L8/8CjOWFACw0d/X/CJ4bdFZTXYJHtIzcHAs6B2NVbQ DEOsvwTgJYB2VgnkjdJvdRtVJHF957i08V2SQRcv6rC/2GQ5yQOTJlKt7RD2Su09AUBE8n FEaQc0uPtn11MWzdMnlacE578RocpXE= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="BA7B/zyS"; spf=pass (imf01.hostedemail.com: domain of masami.hiramatsu@gmail.com designates 209.85.210.169 as permitted sender) smtp.mailfrom=masami.hiramatsu@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713388588; a=rsa-sha256; cv=none; b=MPU7RulVDtAiS6FfxfetFd4qcsQdDvgu+9+0exyuCiXYUtiter2oisWom0blFzHedcfYKX y6phtIr3pSA2OJ3wcck33CVYE+g08DlbG4vrxIDV1wf/cdLjs8HZH5J+ywGTzFhqdmeCkC mag/YBJuzjFPdX319ampWpIcfcEuXD8= Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6ecff9df447so246413b3a.1 for ; Wed, 17 Apr 2024 14:16:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713388587; x=1713993387; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=bn6gtyCUSwijw+6XX0qI9C//f05i55ZPnAFUJjnUL90=; b=BA7B/zySmkepwacr0ENV1q+Anl5qi4G7RbLYhpgu03JWMiL5jCYT6KuhnhZ/mx2C+X lRgDbiWToXVYamkPlEg4gb6hja6kgu3k9XifW+/uAHLo8+MI635O6cnLea4kUonaKOUj ENkZWRmH5wTFkTcClglBtnzaNUOAyziU6ZwqOMVeYWTq3x30wAqo0mUv1i/fCQTOgRtb ELCtzox+pXqiiUBq/rYBEqy4+MHT3V80s8wogOcWWe/SKTm17FXtOeRrJ8BNRCrjBZ9O pPSQm9p8H8PiLrg7SUTy11dC/B+AcxcS8piBCSisq5CTcxuDB/BzW7XHbLrRK+eqyQWZ TKNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713388587; x=1713993387; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bn6gtyCUSwijw+6XX0qI9C//f05i55ZPnAFUJjnUL90=; b=nuw5SlSpW966BhQMjSrYp0Jb+eAvXNXx0mjbso1ZxAG2k2DiPSUfGPyzSelUyiUwyo itDYlxv6K2oDL6Nq4uAB88x+iXNchUDWEbEZqZdsq9IpoukS9A7ehOatGRVfw7DsWgB3 P5NygkjBZf7hnBwddS9n2ImKnLHexlwGiOEsfM+4k3j3Ci2R2MKaekWopSvUSLsEnRi5 bIyHS8ov/zv+0LE0upltEAg0docuyd+0uvnEJQx8D3Ozo2ykFxeQNWaH+efAw2pfi+qk P8SYWltxZ72bxMCQ1ZhVlXvZYBM6bnFZ2AriP7pBNJcY2lq9qGj1wtoi46qqe/jN0ANs 3IuA== X-Forwarded-Encrypted: i=1; AJvYcCV+35HTFgJ4zEWn17UfwKYfyNVIRQprOwIhae0zTICfCdVi52BeR/+fOcdZnWxaKK2rh7vckHkOlVkZ0xjB/iF37fU= X-Gm-Message-State: AOJu0YyXEM2cbTdl4OLLWaVjx79gRohg+5irMzbfbPWECf/3B6hNCSWj 1ekBjmNsrA24XU4TLF7/fErtQRGxSys59TJLc0HlEVB1QO5gcSO2 X-Google-Smtp-Source: AGHT+IGaiPoLXXXpVrpLOJx1iAETWJgKsjUW+rWbh5/bn42gLXIa3/rbbH0xm62Oxp9IYd0WoUIt9A== X-Received: by 2002:aa7:8884:0:b0:6eb:1d5:6e43 with SMTP id z4-20020aa78884000000b006eb01d56e43mr962657pfe.11.1713388587052; Wed, 17 Apr 2024 14:16:27 -0700 (PDT) Received: from devnote2 (113x37x226x201.ap113.ftth.ucom.ne.jp. [113.37.226.201]) by smtp.gmail.com with ESMTPSA id h3-20020a056a00218300b006ed4aa9d48esm110372pfi.212.2024.04.17.14.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 14:16:26 -0700 (PDT) Date: Thu, 18 Apr 2024 06:16:15 +0900 From: Masami Hiramatsu To: Mike Rapoport Cc: linux-kernel@vger.kernel.org, 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 , Michael Ellerman , Nadav Amit , Palmer Dabbelt , Puranjay Mohan , Rick Edgecombe , Russell King , 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: Re: [PATCH v4 14/15] kprobes: remove dependency on CONFIG_MODULES Message-Id: <20240418061615.5fad23b954bf317c029acc4d@gmail.com> In-Reply-To: <20240411160051.2093261-15-rppt@kernel.org> References: <20240411160051.2093261-1-rppt@kernel.org> <20240411160051.2093261-15-rppt@kernel.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Stat-Signature: somp5kjxbikdktqrr5j1p68byx47rp9q X-Rspamd-Queue-Id: 76E7640003 X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1713388588-302621 X-HE-Meta: U2FsdGVkX19WB8HSc6U69lWqVQ+D59UZlO2XgTzbtZAcS6gfKhX4GYCtQQ8eSggoOqRbuLwRf6pwcUm+Zpomc0W47xN8qPSOvJIOwjp8+vUZz4ivw4xYpK5I3QGPPqMgdW+Yx2sYsxrZ6oqGv6gXsiwVowsRG22BkkYD7/2BWvZIwhJM/0Acx/aNVNJRVdN9cNdRzuOIjQvZraCKXH4tZI3IgR/Za+sUZABFUeGFjtxB4CSqDpmJI2Yfa5XY/sBB5YS1DFpI0ow4dRzkTwv0whds3HmIFRc8Vzv03wtM6kD4hfY06uT0p7866iJNol6QDjkursmnCO9eb3LmS6nBgift9U7AG/XPubNi0TdNaYGJXETo8aaAucsjfkjw1w4mKGRWBhM+aYYT4AqIIXUxU/Bw8sgJ45/RavxzioRXtcRGVyuF9KcwBelbD6b0m661btjyZY3yHHragOzwSdveFj/5geoWgS1l+vN137Xa9XUNuNfP+e1k0FBpjxasrLLpR1sXL06iujxjPJPxNGOeKxfXloi/Sv87cumVSw//QZAFEbQWAikHYFhqMCpPY1Ha1wCWOhza2475XE2pmHzHdhIrQcbVAUKWnZmFQuTAK7cLilNC/fQKHGTkLcwePDf6l8JKtLDyC8+vZGXDFVBmZcoXYpfpmZETdkq0kg9Vpzj9Blb6p0MQXHb5N81RRM//ARwJI/dhhtXv/qs6l4p8DvAopUar6IVnYAQ+R4E9gWMqHCf0znoXxiS2/KjhymwFE9bGCZefHPlks1cQ/fQDHUgaOQ0HF/Jy0e0XRaIsUX1qWn8BZLoU2IaUauRY7cWPSwMlC+oQ1OjeqzA8Z5/SYzHNw9hW90qLlAzdTImSey3QmaIKYLbynfbuZyXuwfa0IyZW0uQcpgEqRqyhIV9H5LAL6kX/HIDYxIjoax64Cwpm1Ghr39U8potHK/VMIS7MI9k61dMsuuJ91dE9GTm h8xcsyaX lHNwUlkb2h30Wni//8ugFMZvjt4cr7DplFkC4eIkHzEUQUFcGf7ZBcxHLLoD1Bn9dRLyo4dXRrMwqWfcWSk8fHXQJ21M4ypdOJMCwHzlIthDwJu2z/ztue0K2y1LWlkF/0AEBzamIBREv2Mk8NeAwZzqlDD7pZRIDKtZX5YBlf8KjNjwFW5gXejt6RigosQDyDEDrskRb4zwJLN5NnDOErGhrdxwreon6sp2Sa6yoPjLdWvdylpHqe2gEpou83VZ95Idn8FpSt9MNahzQt9VqLnfEvPM499mkObk0hDfTixFNwBIU9ocdYEvwe0N7Ie5PxOtfSEmevygtvkGrP4MstKL+6It/ByzIAIDkI4m8lbmx95TLcHlxr3GWE8moVjgRCLjGmlp9qR07lxc2dI/8SEwtxlBmrW4TPeTK330Jectc6isYbms3t4/OjbL7IYZgUhf32KQ5OebSb5FSaVN0yYh0lbX9RCwuyAcBZ6cfpmbQfudyB+NDlTUg6OR3377iWjxQMY6TcqX/+dfqrF9szW7yL5q7mH2mLcd4J+eUxlOu+VljwYSw9eDzgPQ7XyhbID9lQDvsNhcCflNrSYU4D45vg+l+sREGk+QryX0qJT8mYppS65wLDPtSWCu5aj15OBt+TmaDcmObN8A23+uF4/gEK5hfV7BHpKJ0 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: Hi Mike, On Thu, 11 Apr 2024 19:00:50 +0300 Mike Rapoport wrote: > 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. Thanks for this work, but this conflicts with the latest fix in v6.9-rc4. Also, can you use IS_ENABLED(CONFIG_MODULES) instead of #ifdefs in function body? We have enough dummy functions for that, so it should not make a problem. Thank you, > > Signed-off-by: Mike Rapoport (IBM) > --- > arch/Kconfig | 2 +- > kernel/kprobes.c | 43 +++++++++++++++++++++---------------- > kernel/trace/trace_kprobe.c | 11 ++++++++++ > 3 files changed, 37 insertions(+), 19 deletions(-) > > diff --git a/arch/Kconfig b/arch/Kconfig > index bc9e8e5dccd5..68177adf61a0 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/kernel/kprobes.c b/kernel/kprobes.c > index 047ca629ce49..90c056853e6f 100644 > --- a/kernel/kprobes.c > +++ b/kernel/kprobes.c > @@ -1580,6 +1580,7 @@ static int check_kprobe_address_safe(struct kprobe *p, > goto out; > } > > +#ifdef CONFIG_MODULES > /* Check if 'p' is probing a module. */ > *probed_mod = __module_text_address((unsigned long) p->addr); > if (*probed_mod) { > @@ -1603,6 +1604,8 @@ static int check_kprobe_address_safe(struct kprobe *p, > ret = -ENOENT; > } > } > +#endif > + > out: > preempt_enable(); > jump_label_unlock(); > @@ -2482,24 +2485,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) > { > @@ -2564,6 +2549,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; > @@ -2665,6 +2669,7 @@ static struct notifier_block kprobe_module_nb = { > .notifier_call = kprobes_module_callback, > .priority = 0 > }; > +#endif > > void kprobe_free_init_mem(void) > { > @@ -2724,8 +2729,10 @@ static int __init init_kprobes(void) > err = arch_init_kprobes(); > if (!err) > err = register_die_notifier(&kprobe_exceptions_nb); > +#ifdef CONFIG_MODULES > if (!err) > err = register_module_notifier(&kprobe_module_nb); > +#endif > > kprobes_initialized = (err == 0); > kprobe_sysctls_init(); > diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c > index 14099cc17fc9..f0610137d6a3 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,7 @@ static struct notifier_block trace_kprobe_module_nb = { > .notifier_call = trace_kprobe_module_callback, > .priority = 1 /* Invoked after kprobe module callback */ > }; > +#endif > > static int count_symbols(void *data, unsigned long unused) > { > @@ -1933,8 +1942,10 @@ static __init int init_kprobe_trace_early(void) > if (ret) > return ret; > > +#ifdef CONFIG_MODULES > if (register_module_notifier(&trace_kprobe_module_nb)) > return -EINVAL; > +#endif > > return 0; > } > -- > 2.43.0 > > -- Masami Hiramatsu