[kernel] refresh 2.6.31 patches

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.30 / 027-mips_module_reloc.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch
index 912857b..019489f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch
@@ -16,16 +16,16 @@
        const struct exception_table_entry *dbe_start;
        const struct exception_table_entry *dbe_end;
 +
        const struct exception_table_entry *dbe_start;
        const struct exception_table_entry *dbe_end;
 +

-+      void *plt_tbl;
-+      unsigned int core_plt_offset;
-+      unsigned int core_plt_size;
-+      unsigned int init_plt_offset;
++      void *phys_plt_tbl;
++      void *virt_plt_tbl;
++      unsigned int phys_plt_offset;
++      unsigned int virt_plt_offset;

  };
  
  typedef uint8_t Elf64_Byte;           /* Type for a 8-bit quantity.  */
 --- a/arch/mips/kernel/module.c
 +++ b/arch/mips/kernel/module.c
  };
  
  typedef uint8_t Elf64_Byte;           /* Type for a 8-bit quantity.  */
 --- a/arch/mips/kernel/module.c
 +++ b/arch/mips/kernel/module.c

-@@ -43,6 +43,114 @@ static struct mips_hi16 *mips_hi16_list;
+@@ -43,6 +43,116 @@ static struct mips_hi16 *mips_hi16_list;

  static LIST_HEAD(dbe_list);
  static DEFINE_SPINLOCK(dbe_lock);
  
  static LIST_HEAD(dbe_list);
  static DEFINE_SPINLOCK(dbe_lock);
  


@@ -35,7 +35,7 @@
 + * physically mapped memory to put the module into.
 + */
 +static unsigned int
 + * physically mapped memory to put the module into.
 + */
 +static unsigned int

-+get_plt_size(const Elf32_Ehdr *hdr, const Elf32_Shdr *sechdrs,
++get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,

 +             const char *secstrings, unsigned int symindex, bool is_init)
 +{
 +      unsigned long ret = 0;
 +             const char *secstrings, unsigned int symindex, bool is_init)
 +{
 +      unsigned long ret = 0;


@@ -103,6 +103,7 @@
 +      return ret;
 +}
 +
 +      return ret;
 +}
 +

++#ifndef MODULE_START

 +static void *alloc_phys(unsigned long size)
 +{
 +      unsigned order;
 +static void *alloc_phys(unsigned long size)
 +{
 +      unsigned order;


@@ -124,6 +125,7 @@
 +
 +      return page_address(page);
 +}
 +
 +      return page_address(page);
 +}

++#endif

 +
 +static void free_phys(void *ptr, unsigned long size)
 +{
 +
 +static void free_phys(void *ptr, unsigned long size)
 +{


@@ -140,7 +142,7 @@
  void *module_alloc(unsigned long size)
  {
  #ifdef MODULE_START
  void *module_alloc(unsigned long size)
  {
  #ifdef MODULE_START

-@@ -58,16 +166,41 @@ void *module_alloc(unsigned long size)
+@@ -58,23 +168,101 @@ void *module_alloc(unsigned long size)

  
        return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
  #else
  
        return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
  #else


@@ -159,14 +161,18 @@
 +              return vmalloc(size);
 +
 +      return ptr;
 +              return vmalloc(size);
 +
 +      return ptr;

- #endif
- }
- 
++#endif
++}
++

 +static inline bool is_phys_addr(void *ptr)
 +{
 +static inline bool is_phys_addr(void *ptr)
 +{

++#ifdef CONFIG_64BIT
++      return (KSEGX((unsigned long)ptr) == CKSEG0);
++#else

 +      return (KSEGX(ptr) == KSEG0);
 +      return (KSEGX(ptr) == KSEG0);

-+}
-+
+ #endif
+ }
+ 

  /* Free memory returned from module_alloc */
  void module_free(struct module *mod, void *module_region)
  {
  /* Free memory returned from module_alloc */
  void module_free(struct module *mod, void *module_region)
  {


@@ -184,7 +190,26 @@
        /* FIXME: If module_region == mod->init_region, trim exception
             table entries. */
  }
        /* FIXME: If module_region == mod->init_region, trim exception
             table entries. */
  }

-@@ -75,6 +208,24 @@ void module_free(struct module *mod, voi
+ 
++static void *__module_alloc(int size, bool phys)
++{
++      void *ptr;
++
++      if (phys)
++              ptr = kmalloc(size, GFP_KERNEL);
++      else
++              ptr = vmalloc(size);
++      return ptr;
++}
++
++static void __module_free(void *ptr)
++{
++      if (is_phys_addr(ptr))
++              kfree(ptr);
++      else
++              vfree(ptr);
++}
++

  int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
                              char *secstrings, struct module *mod)
  {
  int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
                              char *secstrings, struct module *mod)
  {


@@ -199,23 +224,35 @@
 +      core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
 +      init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
 +
 +      core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
 +      init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
 +

-+      mod->arch.core_plt_offset = 0;
-+      mod->arch.core_plt_size = core_size;
-+      mod->arch.init_plt_offset = core_size;
-+      mod->arch.plt_tbl = kmalloc(core_size + init_size, GFP_KERNEL);
-+      if (!mod->arch.plt_tbl)
++      mod->arch.phys_plt_offset = 0;
++      mod->arch.virt_plt_offset = 0;
++      mod->arch.phys_plt_tbl = NULL;
++      mod->arch.virt_plt_tbl = NULL;
++
++      if ((core_size + init_size) == 0)
++              return 0;
++
++      mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
++      if (!mod->arch.phys_plt_tbl)
++              return -ENOMEM;
++
++      mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
++      if (!mod->arch.virt_plt_tbl) {
++              __module_free(mod->arch.phys_plt_tbl);
++              mod->arch.phys_plt_tbl = NULL;

 +              return -ENOMEM;
 +              return -ENOMEM;

++      }

 +
        return 0;
  }
  
 +
        return 0;
  }
  

-@@ -97,45 +248,73 @@ static int apply_r_mips_32_rela(struct m
+@@ -97,27 +285,37 @@ static int apply_r_mips_32_rela(struct m

        return 0;
  }
  
 -static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
 +static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
        return 0;
  }
  
 -static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
 +static Elf_Addr add_plt_entry_to(unsigned *plt_offset,

-+                               void *start, unsigned size, Elf_Addr v)
++                               void *start, Elf_Addr v)

  {
 -      if (v % 4) {
 -              printk(KERN_ERR "module %s: dangerous relocation\n", me->name);
  {
 -      if (v % 4) {
 -              printk(KERN_ERR "module %s: dangerous relocation\n", me->name);


@@ -229,55 +266,53 @@
 -                     me->name);
 -              return -ENOEXEC;
 -      }
 -                     me->name);
 -              return -ENOEXEC;
 -      }

-+      if (*plt_offset == size)
-+              return 0;
-+

 +      *plt_offset += 4 * sizeof(int);
 +      *plt_offset += 4 * sizeof(int);

-+
+ 
+-      *location = (*location & ~0x03ffffff) |
+-                  ((*location + (v >> 2)) & 0x03ffffff);

 +      /* adjust carry for addiu */
 +      if (v & 0x00008000)
 +              v += 0x10000;
  
 +      /* adjust carry for addiu */
 +      if (v & 0x00008000)
 +              v += 0x10000;
  

--      *location = (*location & ~0x03ffffff) |
--                  ((*location + (v >> 2)) & 0x03ffffff);
+-      return 0;

 +      tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
 +      tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
 +      tramp[2] = 0x03200008;                  /* jr t9 */
 +      tramp[3] = 0x00000000;                  /* nop */
 +
 +      return (Elf_Addr) tramp;
 +      tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
 +      tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
 +      tramp[2] = 0x03200008;                  /* jr t9 */
 +      tramp[3] = 0x00000000;                  /* nop */
 +
 +      return (Elf_Addr) tramp;

-+}
-+
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+      if (location >= me->module_core &&
-+          location < me->module_core + me->core_size)
-+              return add_plt_entry_to(&me->arch.core_plt_offset,
-+                              me->module_core, me->core_size, v);
-+
-+      if (location >= me->module_init &&
-+          location < me->module_init + me->init_size)
-+              return add_plt_entry_to(&me->arch.init_plt_offset,
-+                              me->module_init, me->init_size, v);
- 
-       return 0;

  }
  
 -static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
  }
  
 -static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)

++static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
++{
++      if (is_phys_addr(location))
++              return add_plt_entry_to(&me->arch.phys_plt_offset,
++                              me->arch.phys_plt_tbl, v);
++      else
++              return add_plt_entry_to(&me->arch.virt_plt_offset,
++                              me->arch.virt_plt_tbl, v);
++
++}
++

 +static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
  {
        if (v % 4) {
                printk(KERN_ERR "module %s: dangerous relocation\n", me->name);
 +static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
  {
        if (v % 4) {
                printk(KERN_ERR "module %s: dangerous relocation\n", me->name);

-               return -ENOEXEC;
+@@ -125,17 +323,31 @@ static int apply_r_mips_26_rela(struct m

        }
  
        }
  

--      if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
-+      if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000) &&
-+          ((v = add_plt_entry(me, location, v + (ofs << 2))) == 0)) {
-               printk(KERN_ERR
+       if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+-              printk(KERN_ERR
++          v = add_plt_entry(me, location, v + (ofs << 2));
++              if (!v) {
++                      printk(KERN_ERR

                       "module %s: relocation overflow\n",
                       me->name);
                       "module %s: relocation overflow\n",
                       me->name);

-               return -ENOEXEC;
+-              return -ENOEXEC;
++                      return -ENOEXEC;
++              }
++              ofs = 0;

        }
  
 -      *location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
        }
  
 -      *location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);


@@ -299,18 +334,20 @@
  static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
  {
        struct mips_hi16 *n;
  static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
  {
        struct mips_hi16 *n;

-@@ -400,11 +579,23 @@ int module_finalize(const Elf_Ehdr *hdr,
+@@ -400,11 +612,32 @@ int module_finalize(const Elf_Ehdr *hdr,

                list_add(&me->arch.dbe_list, &dbe_list);
                spin_unlock_irq(&dbe_lock);
        }
 +
 +      /* Get rid of the fixup trampoline if we're running the module
 +       * from physically mapped address space */
                list_add(&me->arch.dbe_list, &dbe_list);
                spin_unlock_irq(&dbe_lock);
        }
 +
 +      /* Get rid of the fixup trampoline if we're running the module
 +       * from physically mapped address space */

-+      if (me->arch.core_plt_offset == 0 &&
-+          me->arch.init_plt_offset == me->arch.core_plt_size &&
-+          is_phys_addr(me->module_core)) {
-+              kfree(me->arch.plt_tbl);
-+              me->arch.plt_tbl = NULL;
++      if (me->arch.phys_plt_offset == 0) {
++              __module_free(me->arch.phys_plt_tbl);
++              me->arch.phys_plt_tbl = NULL;
++      }
++      if (me->arch.virt_plt_offset == 0) {
++              __module_free(me->arch.virt_plt_tbl);
++              me->arch.virt_plt_tbl = NULL;

 +      }
 +
        return 0;
 +      }
 +
        return 0;


@@ -318,8 +355,15 @@
  
  void module_arch_cleanup(struct module *mod)
  {
  
  void module_arch_cleanup(struct module *mod)
  {

-+      if (mod->arch.plt_tbl)
-+              kfree(mod->arch.plt_tbl);
++      if (mod->arch.phys_plt_tbl) {
++              __module_free(mod->arch.phys_plt_tbl);
++              mod->arch.phys_plt_tbl = NULL;
++      }
++      if (mod->arch.virt_plt_tbl) {
++              __module_free(mod->arch.virt_plt_tbl);
++              mod->arch.virt_plt_tbl = NULL;
++      }
++

        spin_lock_irq(&dbe_lock);
        list_del(&mod->arch.dbe_list);
        spin_unlock_irq(&dbe_lock);
        spin_lock_irq(&dbe_lock);
        list_del(&mod->arch.dbe_list);
        spin_unlock_irq(&dbe_lock);