Merge branch 'from-rusty/modules-next' into for-4.5/core

As agreed with Rusty, we're taking a current module-next pile through
livepatching.git, as it contains solely patches that are pre-requisity
for module page protection cleanups in livepatching. Rusty will be
restarting module-next from scratch.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

6 files changed, 175 insertions, 196 deletions

diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 4121345498e0..2a20c0dfdafc 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
                         continue;
 
                 kdb_printf("%-20s%8u  0x%p ", mod->name,
-                           mod->core_size, (void *)mod);
+                           mod->core_layout.size, (void *)mod);
 #ifdef CONFIG_MODULE_UNLOAD
                 kdb_printf("%4d ", module_refcount(mod));
 #endif
@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
                         kdb_printf(" (Loading)");
                 else
                         kdb_printf(" (Live)");
-                kdb_printf(" 0x%p", mod->module_core);
+                kdb_printf(" 0x%p", mod->core_layout.base);
 
 #ifdef CONFIG_MODULE_UNLOAD
                 {
diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
index 7080ae1eb6c1..2f9df37940a0 100644
--- a/kernel/gcov/base.c
+++ b/kernel/gcov/base.c
@@ -123,11 +123,6 @@ void gcov_enable_events(void)
 }
 
 #ifdef CONFIG_MODULES
-static inline int within(void *addr, void *start, unsigned long size)
-{
-        return ((addr >= start) && (addr < start + size));
-}
-
 /* Update list and generate events when modules are unloaded. */
 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
                                 void *data)
@@ -142,7 +137,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
 
         /* Remove entries located in module from linked list. */
         while ((info = gcov_info_next(info))) {
-                if (within(info, mod->module_core, mod->core_size)) {
+                if (within_module((unsigned long)info, mod)) {
                         gcov_info_unlink(prev, info);
                         if (gcov_events_enabled)
                                 gcov_event(GCOV_REMOVE, info);
diff --git a/kernel/module.c b/kernel/module.c
index 8f051a106676..912e891e0e2f 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -80,15 +80,6 @@
 # define debug_align(X) (X)
 #endif
 
-/*
- * Given BASE and SIZE this macro calculates the number of pages the
- * memory regions occupies
- */
-#define MOD_NUMBER_OF_PAGES(BASE, SIZE) (((SIZE) > 0) ?         \
-                (PFN_DOWN((unsigned long)(BASE) + (SIZE) - 1) - \
-                         PFN_DOWN((unsigned long)BASE) + 1)     \
-                : (0UL))
-
 /* If this is set, the section belongs in the init part of the module */
 #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
 
@@ -108,13 +99,6 @@ static LIST_HEAD(modules);
  * Use a latched RB-tree for __module_address(); this allows us to use
  * RCU-sched lookups of the address from any context.
  *
- * Because modules have two address ranges: init and core, we need two
- * latch_tree_nodes entries. Therefore we need the back-pointer from
- * mod_tree_node.
- *
- * Because init ranges are short lived we mark them unlikely and have placed
- * them outside the critical cacheline in struct module.
- *
  * This is conditional on PERF_EVENTS || TRACING because those can really hit
  * __module_address() hard by doing a lot of stack unwinding; potentially from
  * NMI context.
@@ -122,24 +106,16 @@ static LIST_HEAD(modules);
 
 static __always_inline unsigned long __mod_tree_val(struct latch_tree_node *n)
 {
-        struct mod_tree_node *mtn = container_of(n, struct mod_tree_node, node);
-        struct module *mod = mtn->mod;
+        struct module_layout *layout = container_of(n, struct module_layout, mtn.node);
 
-        if (unlikely(mtn == &mod->mtn_init))
-                return (unsigned long)mod->module_init;
-
-        return (unsigned long)mod->module_core;
+        return (unsigned long)layout->base;
 }
 
 static __always_inline unsigned long __mod_tree_size(struct latch_tree_node *n)
 {
-        struct mod_tree_node *mtn = container_of(n, struct mod_tree_node, node);
-        struct module *mod = mtn->mod;
-
-        if (unlikely(mtn == &mod->mtn_init))
-                return (unsigned long)mod->init_size;
+        struct module_layout *layout = container_of(n, struct module_layout, mtn.node);
 
-        return (unsigned long)mod->core_size;
+        return (unsigned long)layout->size;
 }
 
 static __always_inline bool
@@ -197,23 +173,23 @@ static void __mod_tree_remove(struct mod_tree_node *node)
  */
 static void mod_tree_insert(struct module *mod)
 {
-        mod->mtn_core.mod = mod;
-        mod->mtn_init.mod = mod;
+        mod->core_layout.mtn.mod = mod;
+        mod->init_layout.mtn.mod = mod;
 
-        __mod_tree_insert(&mod->mtn_core);
-        if (mod->init_size)
-                __mod_tree_insert(&mod->mtn_init);
+        __mod_tree_insert(&mod->core_layout.mtn);
+        if (mod->init_layout.size)
+                __mod_tree_insert(&mod->init_layout.mtn);
 }
 
 static void mod_tree_remove_init(struct module *mod)
 {
-        if (mod->init_size)
-                __mod_tree_remove(&mod->mtn_init);
+        if (mod->init_layout.size)
+                __mod_tree_remove(&mod->init_layout.mtn);
 }
 
 static void mod_tree_remove(struct module *mod)
 {
-        __mod_tree_remove(&mod->mtn_core);
+        __mod_tree_remove(&mod->core_layout.mtn);
         mod_tree_remove_init(mod);
 }
 
@@ -267,9 +243,9 @@ static void __mod_update_bounds(void *base, unsigned int size)
 
 static void mod_update_bounds(struct module *mod)
 {
-        __mod_update_bounds(mod->module_core, mod->core_size);
-        if (mod->init_size)
-                __mod_update_bounds(mod->module_init, mod->init_size);
+        __mod_update_bounds(mod->core_layout.base, mod->core_layout.size);
+        if (mod->init_layout.size)
+                __mod_update_bounds(mod->init_layout.base, mod->init_layout.size);
 }
 
 #ifdef CONFIG_KGDB_KDB
@@ -1214,7 +1190,7 @@ struct module_attribute module_uevent =
 static ssize_t show_coresize(struct module_attribute *mattr,
                              struct module_kobject *mk, char *buffer)
 {
-        return sprintf(buffer, "%u\n", mk->mod->core_size);
+        return sprintf(buffer, "%u\n", mk->mod->core_layout.size);
 }
 
 static struct module_attribute modinfo_coresize =
@@ -1223,7 +1199,7 @@ static struct module_attribute modinfo_coresize =
 static ssize_t show_initsize(struct module_attribute *mattr,
                              struct module_kobject *mk, char *buffer)
 {
-        return sprintf(buffer, "%u\n", mk->mod->init_size);
+        return sprintf(buffer, "%u\n", mk->mod->init_layout.size);
 }
 
 static struct module_attribute modinfo_initsize =
@@ -1873,64 +1849,75 @@ static void mod_sysfs_teardown(struct module *mod)
 /*
  * LKM RO/NX protection: protect module's text/ro-data