module: use a structure to encapsulate layout.

Makes it easier to handle init vs core cleanly, though the change is
fairly invasive across random architectures.

It simplifies the rbtree code immediately, however, while keeping the
core data together in the same cachline (now iff the rbtree code is
enabled).

Acked-by: Peter Zijlstra <peterz@infradead.org>
Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 11 insertions, 11 deletions

diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index 0c1a679314dd..7873e171457c 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
@@ -159,11 +159,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
 
         /* Increase core size by size of got & plt and set start
            offsets for got and plt. */
-        me->core_size = ALIGN(me->core_size, 4);
-        me->arch.got_offset = me->core_size;
-        me->core_size += me->arch.got_size;
-        me->arch.plt_offset = me->core_size;
-        me->core_size += me->arch.plt_size;
+        me->core_layout.size = ALIGN(me->core_layout.size, 4);
+        me->arch.got_offset = me->core_layout.size;
+        me->core_layout.size += me->arch.got_size;
+        me->arch.plt_offset = me->core_layout.size;
+        me->core_layout.size += me->arch.plt_size;
         return 0;
 }
 
@@ -279,7 +279,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
                 if (info->got_initialized == 0) {
                         Elf_Addr *gotent;
 
-                        gotent = me->module_core + me->arch.got_offset +
+                        gotent = me->core_layout.base + me->arch.got_offset +
                                 info->got_offset;
                         *gotent = val;
                         info->got_initialized = 1;
@@ -302,7 +302,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
                         rc = apply_rela_bits(loc, val, 0, 64, 0);
                 else if (r_type == R_390_GOTENT ||
                          r_type == R_390_GOTPLTENT) {
-                        val += (Elf_Addr) me->module_core - loc;
+                        val += (Elf_Addr) me->core_layout.base - loc;
                         rc = apply_rela_bits(loc, val, 1, 32, 1);
                 }
                 break;
@@ -315,7 +315,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
         case R_390_PLTOFF64:    /* 16 bit offset from GOT to PLT. */
                 if (info->plt_initialized == 0) {
                         unsigned int *ip;
-                        ip = me->module_core + me->arch.plt_offset +
+                        ip = me->core_layout.base + me->arch.plt_offset +
                                 info->plt_offset;
                         ip[0] = 0x0d10e310; /* basr 1,0; lg 1,10(1); br 1 */
                         ip[1] = 0x100a0004;
@@ -334,7 +334,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
                                val - loc + 0xffffUL < 0x1ffffeUL) ||
                               (r_type == R_390_PLT32DBL &&
                                val - loc + 0xffffffffULL < 0x1fffffffeULL)))
-                                val = (Elf_Addr) me->module_core +
+                                val = (Elf_Addr) me->core_layout.base +
                                         me->arch.plt_offset +
                                         info->plt_offset;
                         val += rela->r_addend - loc;
@@ -356,7 +356,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
         case R_390_GOTOFF32:    /* 32 bit offset to GOT.  */
         case R_390_GOTOFF64:    /* 64 bit offset to GOT. */
                 val = val + rela->r_addend -
-                        ((Elf_Addr) me->module_core + me->arch.got_offset);
+                        ((Elf_Addr) me->core_layout.base + me->arch.got_offset);
                 if (r_type == R_390_GOTOFF16)
                         rc = apply_rela_bits(loc, val, 0, 16, 0);
                 else if (r_type == R_390_GOTOFF32)
@@ -366,7 +366,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
                 break;
         case R_390_GOTPC:       /* 32 bit PC relative offset to GOT. */
         case R_390_GOTPCDBL:    /* 32 bit PC rel. off. to GOT shifted by 1. */
-                val = (Elf_Addr) me->module_core + me->arch.got_offset +
+                val = (Elf_Addr) me->core_layout.base + me->arch.got_offset +
                         rela->r_addend - loc;
                 if (r_type == R_390_GOTPC)
                         rc = apply_rela_bits(loc, val, 1, 32, 0);