[PATCH v2 2/5] modules: Prepare for handling several RB trees

[Christophe Leroy]

In order to separate text and data, we need to setup
two rb trees. So modify functions to give the tree
as a parameter.

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 kernel/module.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/kernel/module.c b/kernel/module.c
index c0f9d63d3f05..2b9a3d9d3c0d 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -159,14 +159,14 @@ static const struct latch_tree_ops mod_tree_ops = {
        .comp = mod_tree_comp,
 };
 
-static noinline void __mod_tree_insert(struct mod_tree_node *node)
+static noinline void __mod_tree_insert(struct mod_tree_node *node, struct 
mod_tree_root *tree)
 {
-       latch_tree_insert(&node->node, &mod_tree.root, &mod_tree_ops);
+       latch_tree_insert(&node->node, &tree->root, &mod_tree_ops);
 }
 
-static void __mod_tree_remove(struct mod_tree_node *node)
+static void __mod_tree_remove(struct mod_tree_node *node, struct mod_tree_root 
*tree)
 {
-       latch_tree_erase(&node->node, &mod_tree.root, &mod_tree_ops);
+       latch_tree_erase(&node->node, &tree->root, &mod_tree_ops);
 }
 
 /*
@@ -178,28 +178,28 @@ static void mod_tree_insert(struct module *mod)
        mod->core_layout.mtn.mod = mod;
        mod->init_layout.mtn.mod = mod;
 
-       __mod_tree_insert(&mod->core_layout.mtn);
+       __mod_tree_insert(&mod->core_layout.mtn, &mod_tree);
        if (mod->init_layout.size)
-               __mod_tree_insert(&mod->init_layout.mtn);
+               __mod_tree_insert(&mod->init_layout.mtn, &mod_tree);
 }
 
 static void mod_tree_remove_init(struct module *mod)
 {
        if (mod->init_layout.size)
-               __mod_tree_remove(&mod->init_layout.mtn);
+               __mod_tree_remove(&mod->init_layout.mtn, &mod_tree);
 }
 
 static void mod_tree_remove(struct module *mod)
 {
-       __mod_tree_remove(&mod->core_layout.mtn);
+       __mod_tree_remove(&mod->core_layout.mtn, &mod_tree);
        mod_tree_remove_init(mod);
 }
 
-static struct module *mod_find(unsigned long addr)
+static struct module *mod_find(unsigned long addr, struct mod_tree_root *tree)
 {
        struct latch_tree_node *ltn;
 
-       ltn = latch_tree_find((void *)addr, &mod_tree.root, &mod_tree_ops);
+       ltn = latch_tree_find((void *)addr, &tree->root, &mod_tree_ops);
        if (!ltn)
                return NULL;
 
@@ -212,7 +212,7 @@ static void mod_tree_insert(struct module *mod) { }
 static void mod_tree_remove_init(struct module *mod) { }
 static void mod_tree_remove(struct module *mod) { }
 
-static struct module *mod_find(unsigned long addr)
+static struct module *mod_find(unsigned long addr, struct mod_tree_root *tree)
 {
        struct module *mod;
 
@@ -231,22 +231,22 @@ static struct module *mod_find(unsigned long addr)
  * Bounds of module text, for speeding up __module_address.
  * Protected by module_mutex.
  */
-static void __mod_update_bounds(void *base, unsigned int size)
+static void __mod_update_bounds(void *base, unsigned int size, struct 
mod_tree_root *tree)
 {
        unsigned long min = (unsigned long)base;
        unsigned long max = min + size;
 
-       if (min < mod_tree.addr_min)
-               mod_tree.addr_min = min;
-       if (max > mod_tree.addr_max)
-               mod_tree.addr_max = max;
+       if (min < tree->addr_min)
+               tree->addr_min = min;
+       if (max > tree->addr_max)
+               tree->addr_max = max;
 }
 
 static void mod_update_bounds(struct module *mod)
 {
-       __mod_update_bounds(mod->core_layout.base, mod->core_layout.size);
+       __mod_update_bounds(mod->core_layout.base, mod->core_layout.size, 
&mod_tree);
        if (mod->init_layout.size)
-               __mod_update_bounds(mod->init_layout.base, 
mod->init_layout.size);
+               __mod_update_bounds(mod->init_layout.base, 
mod->init_layout.size, &mod_tree);
 }
 
 #ifdef CONFIG_KGDB_KDB
@@ -4739,7 +4739,7 @@ struct module *__module_address(unsigned long addr)
 
        module_assert_mutex_or_preempt();
 
-       mod = mod_find(addr);
+       mod = mod_find(addr, &mod_tree);
        if (mod) {
                BUG_ON(!within_module(addr, mod));
                if (mod->state == MODULE_STATE_UNFORMED)
-- 
2.33.1