From: Aaron Tomlin <atomlin@redhat.com>
To: mcgrof@kernel.org
Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz,
akpm@linux-foundation.org, jeyu@kernel.org,
linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org,
atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com
Subject: [RFC PATCH v2 02/13] module: Simple refactor in preparation for split
Date: Thu, 6 Jan 2022 23:43:08 +0000 [thread overview]
Message-ID: <20220106234319.2067842-3-atomlin@redhat.com> (raw)
In-Reply-To: <20220106234319.2067842-1-atomlin@redhat.com>
No functional change.
This patch makes it possible to move non-essential code
out of core module code.
Signed-off-by: Aaron Tomlin <atomlin@redhat.com>
---
kernel/module/internal.h | 22 ++++++++++++++++++++++
kernel/module/main.c | 23 ++---------------------
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/kernel/module/internal.h b/kernel/module/internal.h
index 33783abc377b..ffc50df010a7 100644
--- a/kernel/module/internal.h
+++ b/kernel/module/internal.h
@@ -7,6 +7,28 @@
#include <linux/elf.h>
#include <asm/module.h>
+#include <linux/mutex.h>
+
+#ifndef ARCH_SHF_SMALL
+#define ARCH_SHF_SMALL 0
+#endif
+
+/* If this is set, the section belongs in the init part of the module */
+#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
+/* Maximum number of characters written by module_flags() */
+#define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4)
+#define MODULE_SECT_READ_SIZE (3 /* "0x", "\n" */ + (BITS_PER_LONG / 4))
+
+extern struct mutex module_mutex;
+extern struct list_head modules;
+
+/* Provided by the linker */
+extern const struct kernel_symbol __start___ksymtab[];
+extern const struct kernel_symbol __stop___ksymtab[];
+extern const struct kernel_symbol __start___ksymtab_gpl[];
+extern const struct kernel_symbol __stop___ksymtab_gpl[];
+extern const s32 __start___kcrctab[];
+extern const s32 __start___kcrctab_gpl[];
struct load_info {
const char *name;
diff --git a/kernel/module/main.c b/kernel/module/main.c
index bc997c3e2c95..2a6b859716c0 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -63,10 +63,6 @@
#define CREATE_TRACE_POINTS
#include <trace/events/module.h>
-#ifndef ARCH_SHF_SMALL
-#define ARCH_SHF_SMALL 0
-#endif
-
/*
* Modules' sections will be aligned on page boundaries
* to ensure complete separation of code and data, but
@@ -78,9 +74,6 @@
# define debug_align(X) (X)
#endif
-/* If this is set, the section belongs in the init part of the module */
-#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
-
/*
* Mutex protects:
* 1) List of modules (also safely readable with preempt_disable),
@@ -88,8 +81,8 @@
* 3) module_addr_min/module_addr_max.
* (delete and add uses RCU list operations).
*/
-static DEFINE_MUTEX(module_mutex);
-static LIST_HEAD(modules);
+DEFINE_MUTEX(module_mutex);
+LIST_HEAD(modules);
/* Work queue for freeing init sections in success case */
static void do_free_init(struct work_struct *w);
@@ -408,14 +401,6 @@ static __maybe_unused void *any_section_objs(const struct load_info *info,
return (void *)info->sechdrs[sec].sh_addr;
}
-/* Provided by the linker */
-extern const struct kernel_symbol __start___ksymtab[];
-extern const struct kernel_symbol __stop___ksymtab[];
-extern const struct kernel_symbol __start___ksymtab_gpl[];
-extern const struct kernel_symbol __stop___ksymtab_gpl[];
-extern const s32 __start___kcrctab[];
-extern const s32 __start___kcrctab_gpl[];
-
#ifndef CONFIG_MODVERSIONS
#define symversion(base, idx) NULL
#else
@@ -1491,7 +1476,6 @@ struct module_sect_attrs {
struct module_sect_attr attrs[];
};
-#define MODULE_SECT_READ_SIZE (3 /* "0x", "\n" */ + (BITS_PER_LONG / 4))
static ssize_t module_sect_read(struct file *file, struct kobject *kobj,
struct bin_attribute *battr,
char *buf, loff_t pos, size_t count)
@@ -4498,9 +4482,6 @@ static void cfi_cleanup(struct module *mod)
#endif
}
-/* Maximum number of characters written by module_flags() */
-#define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4)
-
/* Keep in sync with MODULE_FLAGS_BUF_SIZE !!! */
static char *module_flags(struct module *mod, char *buf)
{
--
2.31.1
next prev parent reply other threads:[~2022-01-06 23:43 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-06 23:43 [RFC PATCH v2 00/13] module: core code clean up Aaron Tomlin
2022-01-06 23:43 ` [RFC PATCH v2 01/13] module: Move all into module/ Aaron Tomlin
2022-01-06 23:43 ` Aaron Tomlin [this message]
2022-01-06 23:43 ` [RFC PATCH v2 03/13] module: Move livepatch support to a separate file Aaron Tomlin
2022-01-12 16:53 ` Petr Mladek
2022-01-12 18:40 ` David Vernet
2022-01-14 9:14 ` Aaron Tomlin
2022-01-12 18:54 ` David Vernet
2022-01-13 10:35 ` Aaron Tomlin
2022-01-13 14:16 ` David Vernet
2022-01-13 15:12 ` Luis Chamberlain
2022-01-06 23:43 ` [RFC PATCH v2 04/13] module: Move latched RB-tree " Aaron Tomlin
2022-01-06 23:43 ` [RFC PATCH v2 05/13] module: Move arch strict rwx " Aaron Tomlin
2022-01-06 23:43 ` [RFC PATCH v2 06/13] module: Move " Aaron Tomlin
2022-01-06 23:43 ` [RFC PATCH v2 07/13] module: Move extra signature support out of core code Aaron Tomlin
2022-01-06 23:43 ` [RFC PATCH v2 08/13] module: Move kmemleak support to a separate file Aaron Tomlin
2022-01-06 23:43 ` [RFC PATCH v2 09/13] module: Move kallsyms support into " Aaron Tomlin
2022-01-06 23:43 ` [RFC PATCH v2 10/13] module: Move procfs " Aaron Tomlin
2022-01-06 23:43 ` [RFC PATCH v2 11/13] module: Move sysfs " Aaron Tomlin
2022-01-06 23:43 ` [RFC PATCH v2 12/13] module: Move kdb_modules list out of core code Aaron Tomlin
2022-01-11 14:55 ` [RFC PATCH v2 00/13] module: core code clean up Allen
2022-01-12 1:16 ` Allen
2022-01-12 13:21 ` Aaron Tomlin
2022-01-12 15:52 ` Luis Chamberlain
2022-01-13 9:23 ` 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=20220106234319.2067842-3-atomlin@redhat.com \
--to=atomlin@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=allen.lkml@gmail.com \
--cc=atomlin@atomlin.com \
--cc=cl@linux.com \
--cc=ghalat@redhat.com \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=mcgrof@kernel.org \
--cc=pmladek@suse.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).