From: Aaron Tomlin <atomlin@redhat.com>
To: mcgrof@kernel.org, christophe.leroy@csgroup.eu
Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org,
jeyu@kernel.org, linux-kernel@vger.kernel.org,
linux-modules@vger.kernel.org, void@manifault.com,
atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com,
msuchanek@suse.de, oleksandr@natalenko.name,
jason.wessel@windriver.com, pmladek@suse.com,
daniel.thompson@linaro.org, hch@infradead.org
Subject: [PATCH v11 08/14] module: Move kmemleak support to a separate file
Date: Thu, 10 Mar 2022 10:24:07 +0000 [thread overview]
Message-ID: <20220310102413.3438665-9-atomlin@redhat.com> (raw)
In-Reply-To: <20220310102413.3438665-1-atomlin@redhat.com>
No functional change.
This patch migrates kmemleak code out of core module
code into kernel/module/debug_kmemleak.c
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Aaron Tomlin <atomlin@redhat.com>
---
kernel/module/Makefile | 1 +
kernel/module/debug_kmemleak.c | 30 ++++++++++++++++++++++++++++++
kernel/module/internal.h | 7 +++++++
kernel/module/main.c | 27 ---------------------------
4 files changed, 38 insertions(+), 27 deletions(-)
create mode 100644 kernel/module/debug_kmemleak.c
diff --git a/kernel/module/Makefile b/kernel/module/Makefile
index d313c8472cb3..12388627725c 100644
--- a/kernel/module/Makefile
+++ b/kernel/module/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_MODULE_SIG) += signing.o
obj-$(CONFIG_LIVEPATCH) += livepatch.o
obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o
obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o
+obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o
diff --git a/kernel/module/debug_kmemleak.c b/kernel/module/debug_kmemleak.c
new file mode 100644
index 000000000000..12a569d361e8
--- /dev/null
+++ b/kernel/module/debug_kmemleak.c
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Module kmemleak support
+ *
+ * Copyright (C) 2009 Catalin Marinas
+ */
+
+#include <linux/module.h>
+#include <linux/kmemleak.h>
+#include "internal.h"
+
+void kmemleak_load_module(const struct module *mod,
+ const struct load_info *info)
+{
+ unsigned int i;
+
+ /* only scan the sections containing data */
+ kmemleak_scan_area(mod, sizeof(struct module), GFP_KERNEL);
+
+ for (i = 1; i < info->hdr->e_shnum; i++) {
+ /* Scan all writable sections that's not executable */
+ if (!(info->sechdrs[i].sh_flags & SHF_ALLOC) ||
+ !(info->sechdrs[i].sh_flags & SHF_WRITE) ||
+ (info->sechdrs[i].sh_flags & SHF_EXECINSTR))
+ continue;
+
+ kmemleak_scan_area((void *)info->sechdrs[i].sh_addr,
+ info->sechdrs[i].sh_size, GFP_KERNEL);
+ }
+}
diff --git a/kernel/module/internal.h b/kernel/module/internal.h
index d6f646a5da41..b0c360839f63 100644
--- a/kernel/module/internal.h
+++ b/kernel/module/internal.h
@@ -167,3 +167,10 @@ static inline int module_sig_check(struct load_info *info, int flags)
return 0;
}
#endif /* !CONFIG_MODULE_SIG */
+
+#ifdef CONFIG_DEBUG_KMEMLEAK
+void kmemleak_load_module(const struct module *mod, const struct load_info *info);
+#else /* !CONFIG_DEBUG_KMEMLEAK */
+static inline void kmemleak_load_module(const struct module *mod,
+ const struct load_info *info) { }
+#endif /* CONFIG_DEBUG_KMEMLEAK */
diff --git a/kernel/module/main.c b/kernel/module/main.c
index c63e10c61694..7dd283959c5c 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -2519,33 +2519,6 @@ bool __weak module_exit_section(const char *name)
return strstarts(name, ".exit");
}
-#ifdef CONFIG_DEBUG_KMEMLEAK
-static void kmemleak_load_module(const struct module *mod,
- const struct load_info *info)
-{
- unsigned int i;
-
- /* only scan the sections containing data */
- kmemleak_scan_area(mod, sizeof(struct module), GFP_KERNEL);
-
- for (i = 1; i < info->hdr->e_shnum; i++) {
- /* Scan all writable sections that's not executable */
- if (!(info->sechdrs[i].sh_flags & SHF_ALLOC) ||
- !(info->sechdrs[i].sh_flags & SHF_WRITE) ||
- (info->sechdrs[i].sh_flags & SHF_EXECINSTR))
- continue;
-
- kmemleak_scan_area((void *)info->sechdrs[i].sh_addr,
- info->sechdrs[i].sh_size, GFP_KERNEL);
- }
-}
-#else
-static inline void kmemleak_load_module(const struct module *mod,
- const struct load_info *info)
-{
-}
-#endif
-
static int validate_section_offset(struct load_info *info, Elf_Shdr *shdr)
{
#if defined(CONFIG_64BIT)
--
2.34.1
next prev parent reply other threads:[~2022-03-10 10:25 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-10 10:23 [PATCH v11 00/14] module: core code clean up Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 01/14] module: Move all into module/ Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 02/14] module: Simple refactor in preparation for split Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 03/14] module: Make internal.h and decompress.c more compliant Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 04/14] module: Move livepatch support to a separate file Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 05/14] module: Move latched RB-tree " Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 06/14] module: Move strict rwx " Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 07/14] module: Move extra signature support out of core code Aaron Tomlin
2022-03-10 10:24 ` Aaron Tomlin [this message]
2022-03-10 10:24 ` [PATCH v11 09/14] module: Move kallsyms support into a separate file Aaron Tomlin
2022-06-28 4:05 ` Steven Rostedt
2022-06-28 8:19 ` Aaron Tomlin
2022-07-01 22:34 ` Luis Chamberlain
2022-07-03 8:33 ` Aaron Tomlin
2022-07-03 13:23 ` Steven Rostedt
2022-07-03 13:57 ` Aaron Tomlin
2022-07-03 14:13 ` Steven Rostedt
2022-07-03 14:24 ` Aaron Tomlin
2022-07-03 17:58 ` Christophe Leroy
2022-07-03 23:18 ` Steven Rostedt
2022-03-10 10:24 ` [PATCH v11 10/14] module: kallsyms: Fix suspicious rcu usage Aaron Tomlin
2022-06-28 3:56 ` Steven Rostedt
2022-06-28 16:21 ` Aaron Tomlin
2022-06-28 16:24 ` Steven Rostedt
2022-03-10 10:24 ` [PATCH v11 11/14] module: Move procfs support into a separate file Aaron Tomlin
2022-03-10 10:26 ` [PATCH v11 12/14] module: Move sysfs " Aaron Tomlin
2022-03-10 10:26 ` [PATCH v11 13/14] module: Move kdb module related code out of main kdb code Aaron Tomlin
2022-03-10 10:30 ` Aaron Tomlin
2022-03-11 16:17 ` Daniel Thompson
2022-03-11 18:00 ` Luis Chamberlain
2022-03-10 10:26 ` [PATCH v11 14/14] module: Move version support into a separate file Aaron Tomlin
2022-03-10 10:32 ` Aaron Tomlin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220310102413.3438665-9-atomlin@redhat.com \
--to=atomlin@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=allen.lkml@gmail.com \
--cc=atomlin@atomlin.com \
--cc=christophe.leroy@csgroup.eu \
--cc=cl@linux.com \
--cc=daniel.thompson@linaro.org \
--cc=hch@infradead.org \
--cc=jason.wessel@windriver.com \
--cc=jeyu@kernel.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=mcgrof@kernel.org \
--cc=msuchanek@suse.de \
--cc=oleksandr@natalenko.name \
--cc=pmladek@suse.com \
--cc=void@manifault.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).