Minor module cleanup 1/3
PATCH 1/1 Minor module cleanup 1/3
Linus, please apply. Nobody uses symbol_put_addr yet, but it's significantly neater to use module_text_addr which does the same "is this in a module" search.
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 */