iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

module: Always have struct mod_tree_root

Browse Source 
In order to separate text and data, we need to setup
two rb trees.

This means that struct mod_tree_root is required even without
MODULES_TREE_LOOKUP.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Aaron Tomlin <atomlin@atomlin.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
Christophe Leroy 2022-02-23 13:02:11 +01:00 committed by Luis Chamberlain
parent 7337f929d5
commit 80b8bf4369
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/module/internal.h
View File

@ -143,15 +143,17 @@ static inline void module_decompress_cleanup(struct load_info *info)
} }
#endif #endif
#ifdef CONFIG_MODULES_TREE_LOOKUP
struct mod_tree_root { struct mod_tree_root {
#ifdef CONFIG_MODULES_TREE_LOOKUP
struct latch_tree_root root; struct latch_tree_root root;
#endif
unsigned long addr_min; unsigned long addr_min;
unsigned long addr_max; unsigned long addr_max;
}; };
extern struct mod_tree_root mod_tree; extern struct mod_tree_root mod_tree;
#ifdef CONFIG_MODULES_TREE_LOOKUP
void mod_tree_insert(struct module *mod); void mod_tree_insert(struct module *mod);
void mod_tree_remove_init(struct module *mod); void mod_tree_remove_init(struct module *mod);
void mod_tree_remove(struct module *mod); void mod_tree_remove(struct module *mod);

5
kernel/module/main.c
View File

@ -74,7 +74,6 @@ static void do_free_init(struct work_struct *w);
static DECLARE_WORK(init_free_wq, do_free_init); static DECLARE_WORK(init_free_wq, do_free_init);
static LLIST_HEAD(init_free_list); static LLIST_HEAD(init_free_list);
#ifdef CONFIG_MODULES_TREE_LOOKUP
struct mod_tree_root mod_tree __cacheline_aligned = { struct mod_tree_root mod_tree __cacheline_aligned = {
.addr_min = -1UL, .addr_min = -1UL,
}; };
@ -82,10 +81,6 @@ struct mod_tree_root mod_tree __cacheline_aligned = {
#define module_addr_min mod_tree.addr_min #define module_addr_min mod_tree.addr_min
#define module_addr_max mod_tree.addr_max #define module_addr_max mod_tree.addr_max
#else /* !CONFIG_MODULES_TREE_LOOKUP */
static unsigned long module_addr_min = -1UL, module_addr_max;
#endif /* CONFIG_MODULES_TREE_LOOKUP */
struct symsearch { struct symsearch {
const struct kernel_symbol *start, *stop; const struct kernel_symbol *start, *stop;
const s32 *crcs; const s32 *crcs;