Move __this_module to xxx.mod.c
PATCH 1/1 Move __this_module to xxx.mod.c
This patch moves the module structure to the generated .mod.c file, instead of compiling it into each object and relying on the linker to include it only once.
--
Brian Gerst
arch/v850/Makefile +0 -5
@@ -22,11 +22,6 @@ CFLAGS += -fno-builtin CFLAGS += -D__linux__ -DUTS_SYSNAME=\"uClinux\" -# This prevents the linker from consolidating the .gnu.linkonce.this_module -# section into .text (which the v850 default linker script for -r does for -# some reason) -LDFLAGS_MODULE += --unique=.gnu.linkonce.this_module - LDFLAGS_BLOB := -b binary --oformat elf32-little OBJCOPY_FLAGS_BLOB := -I binary -O elf32-little -B v850e
include/linux/module.h +0 -13
@@ -406,19 +406,6 @@#ifdef MODULE extern struct module __this_module; -#ifdef KBUILD_MODNAME -/* We make the linker do some of the work. */ -struct module __this_module -__attribute__((section(".gnu.linkonce.this_module"))) = { - .name = __stringify(KBUILD_MODNAME), - .symbols = { .owner = &__this_module }, - .gpl_symbols = { .owner = &__this_module, .gplonly = 1 }, - .init = init_module, -#ifdef CONFIG_MODULE_UNLOAD - .exit = cleanup_module, -#endif -}; -#endif /* KBUILD_MODNAME */ #endif /* MODULE */ #define symbol_request (x) try_then_request_module(symbol_get(x), "symbol:" #x)
kernel/module.c +1 -1
@@ -1125,7 +1125,7 @@ strindex = sechdrs[i].sh_link;DEBUGP ("String table found in section %u\n" , strindex); }else if (strcmp (secstrings+sechdrs[i].sh_name, -".gnu.linkonce.this_module" ) ==0 ) { +"___this_module" ) ==0 ) {/* The module struct */ DEBUGP ("Module in section %u\n" , i); modindex = i;
scripts/modpost.c +17 -2
@@ -287,6 +287,10 @@/* undefined symbol */ if (ELF_ST_BIND (sym->st_info) !=STB_GLOBAL )break ; + +/* ignore __this_module */ +if (!strcmp (symname,"__this_module" )) +break ; s =alloc_symbol (symname);/* add to list */
@@ -378,7 +382,7 @@/* Header for the generated file */ void -add_header (struct buffer *b) +add_header (struct buffer *b,struct module *mod) {buf_printf (b,"#include <linux/module.h>\n" );buf_printf (b,"#include <linux/vermagic.h>\n" );
@@ -386,6 +390,17 @@buf_printf (b,"const char vermagic[]\n" );buf_printf (b,"__attribute__((section(\"__vermagic\"))) =\n" );buf_printf (b,"VERMAGIC_STRING;\n" ); +buf_printf (b,"\n" ); +buf_printf (b,"struct module __this_module\n" ); +buf_printf (b,"__attribute__((section(\"___this_module\"))) = {\n" ); +buf_printf (b,"\t.name = \"%s\",\n" ,strrchr (mod->name,'/' ) +1 ); +buf_printf (b,"\t.symbols = { .owner = &__this_module },\n" ); +buf_printf (b,"\t.gpl_symbols = { .owner = &__this_module, .gplonly = 1 },\n" ); +buf_printf (b,"\t.init = init_module,\n" ); +buf_printf (b,"#ifdef CONFIG_MODULE_UNLOAD\n" ); +buf_printf (b,"\t.exit = cleanup_module,\n" ); +buf_printf (b,"#endif\n" ); +buf_printf (b,"};\n" ); }/* Record CRCs for unresolved symbols */
@@ -526,7 +541,7 @@ buf.pos =0 ; -add_header (&buf); +add_header (&buf, mod);add_versions (&buf, mod);add_depends (&buf, mod, modules);add_moddevtable (&buf, mod);
Quoted 3 lines · Brian Gerst
This patch moves the module structure to the generated
.mod.cfile, instead of compiling it into each object and relying on the linker to include it only once.
Yeah, it's something I though about doing, but I was not sure. I think it's up to Rusty to comment ;)
It will need an associated change to module_init_tools.
Another comment:
scripts/modpost.c +4 -0
@@ -287,6 +287,10 @@/* undefined symbol */ if (ELF_ST_BIND (sym->st_info) !=STB_GLOBAL )break ; + +/* ignore __this_module */ +if (!strcmp (symname,"__this_module" )) +break ; s =alloc_symbol (symname);/* add to list */
Is that necessary? __this_module shouldn't be unresolved, so this case should never be hit AFAICS.
--Kai
Quoted 30 lines · Kai Germaschewski
Quoted 3 lines · Brian Gerst
This patch moves the module structure to the generated
.mod.cfile, instead of compiling it into each object and relying on the linker to include it only once.Yeah, it's something I though about doing, but I was not sure. I think it's up to Rusty to comment ;)
It will need an associated change to
module_init_tools.Another comment:
diff -urN
linux-2.5.61-bk1/scripts/modpost.clinux/scripts/modpost.cscripts/modpost.c +4
-0@@ -287,6 +287,10 @@/* undefined symbol */ if (ELF_ST_BIND (sym->st_info) !=STB_GLOBAL )break ; + +/* ignore __this_module */ +if (!strcmp (symname,"__this_module" )) +break ; s =alloc_symbol (symname);/* add to list */
Quoted 2 lines
Is that necessary?
__this_moduleshouldn't be unresolved, so this case should never be hit AFAICS.
After the definition is removed from module.h, it is unresolved before it is linked to xxx.mod.c.
--
Brian Gerst
In message <[email protected]> yo u write:
Quoted 10 lines · Brian Gerst
Quoted 4 lines
This patch moves the module structure to the generated
.mod.cfile, instead of compiling it into each object and relying on the linker to include it only once.Yeah, it's something I though about doing, but I was not sure. I think it's up to Rusty to comment ;)
It will need an associated change to
module_init_tools.
I don't think so: the symbol will be in the module by the time module-init-tools gets to it, or am I missing something?
Rusty.
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
Quoted 2 lines · Rusty Russell
I don't think so: the symbol will be in the module by the time module-init-tools gets to it, or am I missing something?
Yes, but modprobe will look for .gnu.linkonce.__this_module if it wants to change the name (but that's now in ___this_module).
--Kai
In message <[email protected]> yo u write:
Quoted 7 lines · Rusty Russell
Quoted 3 lines
I don't think so: the symbol will be in the module by the time module-init-tools gets to it, or am I missing something?
Yes, but modprobe will look for .gnu.linkonce.__this_module if it wants to change the name (but that's now in
___this_module).
Good point. The name change thing is a known hack, of course, but will fix userspace.
Rusty.
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.