Re-xmit: module code tidyup
PATCH 1/1 Re-xmit: module code tidyup
Linus, please apply.
Three patches (applicable with one patch -p1):
o Make module_text_address return the module found, not just true/false.
o Remove struct kernel_symbol_group: just iterate through the modules.
o Remove struct exception_table: just iterate through the modules.
These cleanups made possible by the fact that symbol and exception table traversal now entirely within kernel/module.c.
Thanks,
Rusty.
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
Name: module_text_address returns the module
Author: Rusty Russell
Status: Trivial
D: By making module_text_address return the module it found, we
D: simplify symbol_put_addr significantly.
include/linux/module.h +3 -3
@@ -268,7 +268,7 @@ static inline int module_is_live(struct }/* Is this address in a module? */ -int module_text_address (unsigned long addr); +struct module *module_text_address (unsigned long addr);#ifdef CONFIG_MODULE_UNLOAD
@@ -361,9 +361,9 @@ search_module_extables(unsigned long add }/* Is this address in a module? */ -static inline int module_text_address (unsigned long addr) +static inline struct module *module_text_address (unsigned long addr) { -return 0 ; +return NULL ; }/* Get/put a kernel symbol (calls should be symmetric) */
kernel/extable.c +1 -1
@@ -38,5 +38,5 @@ int kernel_text_address(unsigned long ad addr <= (unsigned long)_etext)return 1 ; -return module_text_address (addr); +return module_text_address (addr) !=NULL ; }
kernel/module.c +6 -15
@@ -552,23 +552,14 @@ EXPORT_SYMBOL(__symbol_put);void symbol_put_addr (void *addr) { -struct kernel_symbol_group *ks;unsigned long flags;spin_lock_irqsave (&modlist_lock, flags); -list_for_each_entry (ks, &symbols, list) { -unsigned int i; +if (!kernel_text_address ((unsigned long )addr)) +BUG (); -for (i =0 ; i < ks->num_syms; i++) { -if (ks->syms[i].value == (unsigned long )addr) { -module_put (ks->owner); -spin_unlock_irqrestore (&modlist_lock, flags); -return ; - } - } - } +module_put (module_text_address ((unsigned long )addr));spin_unlock_irqrestore (&modlist_lock, flags); -BUG (); }EXPORT_SYMBOL_GPL (symbol_put_addr);
@@ -1545,15 +1536,15 @@ const struct exception_table_entry *sear }/* Is this a valid kernel address? We don't grab the lock: we are oopsing. */ -int module_text_address (unsigned long addr) +struct module *module_text_address (unsigned long addr) {struct module *mod;list_for_each_entry (mod, &modules, list)if (within (addr, mod->module_init, mod->init_size) ||within (addr, mod->module_core, mod->core_size)) -return 1 ; -return 0 ; +return mod; +return NULL ; }/* Provided by the linker */
Name: Symbol list removal
Author: Rusty Russell
Status: Tested on 2.5.66-bk2
Depends: Module/module-text-address.patch.gz
D: This removes the symbol list, and the concept of kernel symbol groups,
D: in favour of just iterating through the modules. Now all iteration is
D: within kernel/module.c, this is a fairly trivial cleanup.
include/linux/module.h +6 -28
@@ -115,22 +115,6 @@ extern const struct gtype##_id __mod_##g#define MODULE_DEVICE_TABLE (type,name) \ MODULE_GENERIC_TABLE(type##_device,name) -struct kernel_symbol_group -{ -/* Links us into the global symbol list */ -struct list_head list; - -/* Module which owns it (if any) */ -struct module *owner; - -/* Are we internal use only? */ -int gplonly; - -unsigned int num_syms; -const struct kernel_symbol *syms; -const unsigned long *crcs; -}; -/* Given an address, look for it in the exception tables */ const struct exception_table_entry *search_exception_tables (unsigned long add);
@@ -214,10 +198,14 @@ struct modulechar name[MODULE_NAME_LEN ];/* Exported symbols */ -struct kernel_symbol_group symbols; +const struct kernel_symbol *syms; +unsigned int num_ksyms; +const unsigned long *crcs;/* GPL-only exported symbols. */ -struct kernel_symbol_group gpl_symbols; +const struct kernel_symbol *gpl_syms; +unsigned int num_gpl_syms; +const unsigned long *gpl_crcs;/* Exception tables */ struct exception_table extable;
@@ -411,8 +399,6 @@ extern struct module __this_module; 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,
@@ -472,14 +458,6 @@ static inline void __deprecated _MOD_INC#define EXPORT_NO_SYMBOLS #define __MODULE_STRING (x) __stringify(x) -/* -* The exception and symbol tables, and the lock -* to protect them. -*/ -extern spinlock_t modlist_lock; -extern struct list_head extables; -extern struct list_head symbols; -/* Use symbol_get and symbol_put instead. You'll thank me. */ #define HAVE_INTER_MODULE extern void inter_module_register (const char *,struct module *,const void *);
kernel/module.c +75 -86
264 lines not on this page · raw message
b_gpl;
- kernel_gpl_symbols.gplonly = 1;
- list_add(&kernel_gpl_symbols.list, &symbols);
-
- return 0;
+ return mod;
+ return NULL;
}
-
-__initcall(symbols_init);
Name: Extable list removal
Author: Rusty Russell
Status: Tested on 2.5.66-bk2
Depends: Module/symbol-list.patch.gz
D: This removes the extable list, and the struct exception_table, in
D: favour of just iterating through the modules. Now all iteration is
D: within kernel/module.c, this is a fairly trivial cleanup.
include/linux/module.h +5 -12
@@ -18,7 +18,6 @@#include <linux/stringify.h> #include <asm/module.h> -#include <asm/uaccess.h> /* For struct exception_table_entry */ /* Not Yet Implemented */ #define MODULE_AUTHOR (name)
@@ -51,6 +50,8 @@ extern int init_module(void);extern void cleanup_module (void );/* Archs provide a method of finding the correct exception table. */ +struct exception_table_entry ; +const struct exception_table_entry * search_extable(const struct exception_table_entry *first, const struct exception_table_entry *last,
@@ -116,15 +117,6 @@ extern const struct gtype##_id __mod_##g/* Given an address, look for it in the exception tables */ const struct exception_table_entry *search_exception_tables (unsigned long add); -struct exception_table -{ -struct list_head list; - -unsigned int num_entries; -const struct exception_table_entry *entry; -}; - -#ifdef CONFIG_MODULES /* Get/put a kernel symbol (calls must be symmetric) */
@@ -205,8 +197,9 @@ struct moduleunsigned int num_gpl_syms;const unsigned long *gpl_crcs; -/* Exception tables */ -struct exception_table extable; +/* Exception table */ +unsigned int num_exentries; +const struct exception_table_entry *extable;/* Startup function. */ int (*init)(void );
kernel/extable.c +1 -0
@@ -16,6 +16,7 @@Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/module.h> +#include <asm/uaccess.h> extern const struct exception_table_entry __start___ex_table[];extern const struct exception_table_entry __stop___ex_table[];
kernel/module.c +10 -16
@@ -51,13 +51,12 @@#define symbol_is (literal, string) \ (strcmp(MODULE_SYMBOL_PREFIX literal, (string)) == 0) -/* Protects extables and symbols lists */ +/* Protects module list */ static spinlock_t modlist_lock =SPIN_LOCK_UNLOCKED ;/* List of modules, protected by module_mutex AND modlist_lock */ static DECLARE_MUTEX (module_mutex);static LIST_HEAD (modules); -static LIST_HEAD (extables);/* We require a truly strong try_module_get() */ static inline int strong_try_module_get (struct module *mod)
@@ -845,7 +841,6 @@ static void free_module(struct module *m/* Delete from various lists */ spin_lock_irq (&modlist_lock);list_del (&mod->list); -list_del (&mod->extable.list);spin_unlock_irq (&modlist_lock);/* Module unload stuff */
@@ -1312,14 +1308,9 @@ static struct module *load_module(void * }#endif -/* Set up exception table */ -if (exindex) { -/* FIXME: Sort exception table. */ - mod->extable.num_entries = (sechdrs[exindex].sh_size - /sizeof (struct -exception_table_entry )); - mod->extable.entry = (void *)sechdrs[exindex].sh_addr; - } +/* Set up exception table */ + mod->num_exentries = sechdrs[exindex].sh_size /sizeof (*mod->extable); + mod->extable = (void *)sechdrs[exindex].sh_addr;/* Now handle each section. */ for (i =1 ; i < hdr->e_shnum; i++) {
@@ -1421,7 +1411,6 @@ sys_init_module(void *umod,/* Now sew it into the lists. They won't access us, since strong_try_module_get() will fail. */ spin_lock_irq (&modlist_lock); -list_add (&mod->extable.list, &extables);list_add (&mod->list, &modules);spin_unlock_irq (&modlist_lock);
@@ -1584,14 +1573,16 @@ const struct exception_table_entry *sear {unsigned long flags;const struct exception_table_entry *e =NULL ; -struct exception_table *i; +struct module *mod;spin_lock_irqsave (&modlist_lock, flags); -list_for_each_entry (i, &extables, list) { -if (i->num_entries ==0 ) +list_for_each_entry (mod, &modules, list) { +if (mod->num_exentries ==0 )continue ; - e =search_extable (i->entry, i->entry+i->num_entries-1 , addr); + e =search_extable (mod->extable, + mod->extable + mod->num_exentries -1 , + addr);if (e)break ; }