aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAlexey Gladkov <gladkov.alexey@gmail.com>2019-04-29 12:11:14 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-05-07 08:50:24 -0400
commit898490c010b5d2e499e03b7e815fc214209ac583 (patch)
treefcd97072081ce9db13a84bb6463e55923479a171 /include/linux
parent4c11edfcf70bea4cb0a3f4992ac6a4852e8bdc31 (diff)
moduleparam: Save information about built-in modules in separate file
Problem: When a kernel module is compiled as a separate module, some important information about the kernel module is available via .modinfo section of the module. In contrast, when the kernel module is compiled into the kernel, that information is not available. Information about built-in modules is necessary in the following cases: 1. When it is necessary to find out what additional parameters can be passed to the kernel at boot time. 2. When you need to know which module names and their aliases are in the kernel. This is very useful for creating an initrd image. Proposal: The proposed patch does not remove .modinfo section with module information from the vmlinux at the build time and saves it into a separate file after kernel linking. So, the kernel does not increase in size and no additional information remains in it. Information is stored in the same format as in the separate modules (null-terminated string array). Because the .modinfo section is already exported with a separate modules, we are not creating a new API. It can be easily read in the userspace: $ tr '\0' '\n' < modules.builtin.modinfo ext4.softdep=pre: crc32c ext4.license=GPL ext4.description=Fourth Extended Filesystem ext4.author=Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others ext4.alias=fs-ext4 ext4.alias=ext3 ext4.alias=fs-ext3 ext4.alias=ext2 ext4.alias=fs-ext2 md_mod.alias=block-major-9-* md_mod.alias=md md_mod.description=MD RAID framework md_mod.license=GPL md_mod.parmtype=create_on_open:bool md_mod.parmtype=start_dirty_degraded:int ... Co-Developed-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org> Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org> Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> Acked-by: Jessica Yu <jeyu@kernel.org> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/module.h1
-rw-r--r--include/linux/moduleparam.h12
2 files changed, 6 insertions, 7 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index 5bf5dcd91009..5f7007430d35 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -253,6 +253,7 @@ extern typeof(name) __mod_##type##__##name##_device_table \
253#define MODULE_VERSION(_version) MODULE_INFO(version, _version) 253#define MODULE_VERSION(_version) MODULE_INFO(version, _version)
254#else 254#else
255#define MODULE_VERSION(_version) \ 255#define MODULE_VERSION(_version) \
256 MODULE_INFO(version, _version); \
256 static struct module_version_attribute ___modver_attr = { \ 257 static struct module_version_attribute ___modver_attr = { \
257 .mattr = { \ 258 .mattr = { \
258 .attr = { \ 259 .attr = { \
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index ba36506db4fb..5ba250d9172a 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -10,23 +10,21 @@
10 module name. */ 10 module name. */
11#ifdef MODULE 11#ifdef MODULE
12#define MODULE_PARAM_PREFIX /* empty */ 12#define MODULE_PARAM_PREFIX /* empty */
13#define __MODULE_INFO_PREFIX /* empty */
13#else 14#else
14#define MODULE_PARAM_PREFIX KBUILD_MODNAME "." 15#define MODULE_PARAM_PREFIX KBUILD_MODNAME "."
16/* We cannot use MODULE_PARAM_PREFIX because some modules override it. */
17#define __MODULE_INFO_PREFIX KBUILD_MODNAME "."
15#endif 18#endif
16 19
17/* Chosen so that structs with an unsigned long line up. */ 20/* Chosen so that structs with an unsigned long line up. */
18#define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long)) 21#define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
19 22
20#ifdef MODULE
21#define __MODULE_INFO(tag, name, info) \ 23#define __MODULE_INFO(tag, name, info) \
22static const char __UNIQUE_ID(name)[] \ 24static const char __UNIQUE_ID(name)[] \
23 __used __attribute__((section(".modinfo"), unused, aligned(1))) \ 25 __used __attribute__((section(".modinfo"), unused, aligned(1))) \
24 = __stringify(tag) "=" info 26 = __MODULE_INFO_PREFIX __stringify(tag) "=" info
25#else /* !MODULE */ 27
26/* This struct is here for syntactic coherency, it is not used */
27#define __MODULE_INFO(tag, name, info) \
28 struct __UNIQUE_ID(name) {}
29#endif
30#define __MODULE_PARM_TYPE(name, _type) \ 28#define __MODULE_PARM_TYPE(name, _type) \
31 __MODULE_INFO(parmtype, name##type, #name ":" _type) 29 __MODULE_INFO(parmtype, name##type, #name ":" _type)
32 30