In-kernel module loader 7/7
PATCH 1/1 In-kernel module loader 7/7
Name: New Module Loader Base: x86 support
Author: Rusty Russell
Status: Tested on 2.5.27
Depends: Module/modbase-try.patch.gz
D: This patch provides basic x86 support for modules.
arch/i386/kernel/Makefile +1 -0
@@ -26,6 +26,7 @@ obj-$(CONFIG_X86_LOCAL_APIC) += mpparse. obj-$(CONFIG_X86_IO_APIC) += io_apic.o obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o obj-$(CONFIG_X86_NUMAQ) += numaq.o +obj-$(CONFIG_MODULES) += module.o ifdef CONFIG_VISWS obj-y += setup-visws.o obj-$(CONFIG_X86_VISWS_APIC) += visws_apic.o
arch/i386/kernel/entry.S +3 -3
@@ -636,10 +636,10 @@ ENTRY(sys_call_table) .long sys_adjtimex .long sys_mprotect /* 125 */ .long sys_sigprocmask - .long sys_create_module + .long sys_ni_syscall /* old "create_module" */ .long sys_init_module .long sys_delete_module - .long sys_get_kernel_syms /* 130 */ + .long sys_ni_syscall /* 130: old "get_kernel_syms" */ .long sys_quotactl .long sys_getpgid .long sys_fchdir
@@ -676,7 +676,7 @@ ENTRY(sys_call_table) .long sys_setresuid16 .long sys_getresuid16 /* 165 */ .long sys_vm86 - .long sys_query_module + .long sys_ni_syscall /* Old sys_query_module */ .long sys_poll .long sys_nfsservctl .long sys_setresgid16 /* 170 */
arch/i386/kernel/module.c +130 -0
130 lines not on this page · raw message
arch/i386/kernel/traps.c +4 -4
@@ -99,8 +99,8 @@ static int kstack_depth_to_print = 24;#ifdef CONFIG_MODULES -extern struct module *module_list; -extern struct module kernel_module; +/* FIXME: Accessed without a lock --RR */ +extern struct list_head modules;static inline int kernel_text_address (unsigned long addr) {
@@ -111,11 +111,11 @@ static inline int kernel_text_address(un addr <= (unsigned long) &_etext)return 1 ; -for (mod = module_list; mod != &kernel_module; mod = mod->next) { +list_for_each_entry (mod, &modules, list) {/* mod_bound tests for addr being inside the vmalloc'ed * module area. Of course it'd be better to test only * for the .text subset... */ -if (mod_bound (addr,0 , mod)) { +if (mod_bound ((void *)addr,0 , mod)) { retval =1 ;break ; }
arch/i386/mm/extable.c +8 -6
@@ -44,15 +44,17 @@ search_exception_table(unsigned long addreturn ret;#else unsigned long flags; -/* The kernel is the last "module" -- no need to treat it special. */ -struct module *mp; +struct list_head *i; +/* The kernel is the last "module" -- no need to treat it special. */ spin_lock_irqsave (&modlist_lock, flags); -for (mp = module_list; mp !=NULL ; mp = mp->next) { -if (mp->ex_table_start ==NULL || !(mp->flags&(MOD_RUNNING |MOD_INITIALIZING ))) +list_for_each (i, &extables) { +struct exception_table *ex + = list_entry(i, struct exception_table, list); +if (ex->num_entries ==0 )continue ; - ret =search_one_table (mp->ex_table_start, - mp->ex_table_end -1 , addr); + ret =search_one_table (ex->entry, + ex->entry + ex->num_entries -1 , addr);if (ret)break ; }
arch/i386/vmlinux.lds.S +1 -0
@@ -25,6 +25,7 @@ SECTIONS __ex_table : { *(__ex_table) } __stop___ex_table = .; + . = ALIGN(64); __start___ksymtab = .; /* Kernel symbol table */ __ksymtab : { *(__ksymtab) } __stop___ksymtab = .;
include/asm-i386/module.h +7 -8
@@ -1,12 +1,11 @@#ifndef _ASM_I386_MODULE_H#define _ASM_I386_MODULE_H -/* -* This file contains the i386 architecture specific module code. -*/ - -#define module_map (x) vmalloc(x) -#define module_unmap (x) vfree(x) -#define module_arch_init (x) (0) -#define arch_init_modules (x) do { } while (0) +/* x86 is simple */ +struct mod_arch_specific +{ +}; +#define Elf_Shdr Elf32_Shdr +#define Elf_Sym Elf32_Sym +#define Elf_Ehdr Elf32_Ehdr#endif /* _ASM_I386_MODULE_H */
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.