[kernel] update to 2.6.30, refresh patches
[openwrt-10.03/.git] / target / linux / cobalt / patches / 001-no_module_reloc.patch
1 --- a/arch/mips/Makefile
2 +++ b/arch/mips/Makefile
3 @@ -83,7 +83,7 @@ all-$(CONFIG_BOOT_ELF64)      := $(vmlinux-64
4  cflags-y                       += -G 0 -mno-abicalls -fno-pic -pipe
5  cflags-y                       += -msoft-float
6  LDFLAGS_vmlinux                        += -G 0 -static -n -nostdlib
7 -MODFLAGS                       += -mno-long-calls
8 +MODFLAGS                       += -mlong-calls
9  
10  cflags-y += -ffreestanding
11  
12 --- a/arch/mips/include/asm/module.h
13 +++ b/arch/mips/include/asm/module.h
14 @@ -9,11 +9,6 @@ struct mod_arch_specific {
15         struct list_head dbe_list;
16         const struct exception_table_entry *dbe_start;
17         const struct exception_table_entry *dbe_end;
18 -
19 -       void *plt_tbl;
20 -       unsigned int core_plt_offset;
21 -       unsigned int core_plt_size;
22 -       unsigned int init_plt_offset;
23  };
24  
25  typedef uint8_t Elf64_Byte;            /* Type for a 8-bit quantity.  */
26 --- a/arch/mips/kernel/module.c
27 +++ b/arch/mips/kernel/module.c
28 @@ -43,116 +43,6 @@ static struct mips_hi16 *mips_hi16_list;
29  static LIST_HEAD(dbe_list);
30  static DEFINE_SPINLOCK(dbe_lock);
31  
32 -/*
33 - * Get the potential max trampolines size required of the init and
34 - * non-init sections. Only used if we cannot find enough contiguous
35 - * physically mapped memory to put the module into.
36 - */
37 -static unsigned int
38 -get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
39 -             const char *secstrings, unsigned int symindex, bool is_init)
40 -{
41 -       unsigned long ret = 0;
42 -       unsigned int i, j;
43 -       Elf_Sym *syms;
44 -
45 -       /* Everything marked ALLOC (this includes the exported symbols) */
46 -       for (i = 1; i < hdr->e_shnum; ++i) {
47 -               unsigned int info = sechdrs[i].sh_info;
48 -
49 -               if (sechdrs[i].sh_type != SHT_REL
50 -                   && sechdrs[i].sh_type != SHT_RELA)
51 -                       continue;
52 -
53 -               /* Not a valid relocation section? */
54 -               if (info >= hdr->e_shnum)
55 -                       continue;
56 -
57 -               /* Don't bother with non-allocated sections */
58 -               if (!(sechdrs[info].sh_flags & SHF_ALLOC))
59 -                       continue;
60 -
61 -               /* If it's called *.init*, and we're not init, we're
62 -                   not interested */
63 -               if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
64 -                   != is_init)
65 -                       continue;
66 -
67 -               syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
68 -               if (sechdrs[i].sh_type == SHT_REL) {
69 -                       Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
70 -                       unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
71 -
72 -                       for (j = 0; j < size; ++j) {
73 -                               Elf_Sym *sym;
74 -
75 -                               if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
76 -                                       continue;
77 -
78 -                               sym = syms + ELF_MIPS_R_SYM(rel[j]);
79 -                               if (!is_init && sym->st_shndx != SHN_UNDEF)
80 -                                       continue;
81 -
82 -                               ret += 4 * sizeof(int);
83 -                       }
84 -               } else {
85 -                       Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
86 -                       unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
87 -
88 -                       for (j = 0; j < size; ++j) {
89 -                               Elf_Sym *sym;
90 -
91 -                               if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
92 -                                       continue;
93 -
94 -                               sym = syms + ELF_MIPS_R_SYM(rela[j]);
95 -                               if (!is_init && sym->st_shndx != SHN_UNDEF)
96 -                                       continue;
97 -
98 -                               ret += 4 * sizeof(int);
99 -                       }
100 -               }
101 -       }
102 -
103 -       return ret;
104 -}
105 -
106 -#ifndef MODULE_START
107 -static void *alloc_phys(unsigned long size)
108 -{
109 -       unsigned order;
110 -       struct page *page;
111 -       struct page *p;
112 -
113 -       size = PAGE_ALIGN(size);
114 -       order = get_order(size);
115 -
116 -       page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
117 -                       __GFP_THISNODE, order);
118 -       if (!page)
119 -               return NULL;
120 -
121 -       split_page(page, order);
122 -
123 -       for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
124 -               __free_page(p);
125 -
126 -       return page_address(page);
127 -}
128 -#endif
129 -
130 -static void free_phys(void *ptr, unsigned long size)
131 -{
132 -       struct page *page;
133 -       struct page *end;
134 -
135 -       page = virt_to_page(ptr);
136 -       end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
137 -
138 -       for (; page < end; ++page)
139 -               __free_page(page);
140 -}
141 -
142  void *module_alloc(unsigned long size)
143  {
144  #ifdef MODULE_START
145 @@ -168,45 +58,16 @@ void *module_alloc(unsigned long size)
146  
147         return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
148  #else
149 -       void *ptr;
150 -
151         if (size == 0)
152                 return NULL;
153 -
154 -       ptr = alloc_phys(size);
155 -
156 -       /* If we failed to allocate physically contiguous memory,
157 -        * fall back to regular vmalloc. The module loader code will
158 -        * create jump tables to handle long jumps */
159 -       if (!ptr)
160 -               return vmalloc(size);
161 -
162 -       return ptr;
163 -#endif
164 -}
165 -
166 -static inline bool is_phys_addr(void *ptr)
167 -{
168 -#ifdef CONFIG_64BIT
169 -       return (KSEGX((unsigned long)ptr) == CKSEG0);
170 -#else
171 -       return (KSEGX(ptr) == KSEG0);
172 +       return vmalloc(size);
173  #endif
174  }
175  
176  /* Free memory returned from module_alloc */
177  void module_free(struct module *mod, void *module_region)
178  {
179 -       if (is_phys_addr(module_region)) {
180 -               if (mod->module_init == module_region)
181 -                       free_phys(module_region, mod->init_size);
182 -               else if (mod->module_core == module_region)
183 -                       free_phys(module_region, mod->core_size);
184 -               else
185 -                       BUG();
186 -       } else {
187 -               vfree(module_region);
188 -       }
189 +       vfree(module_region);
190         /* FIXME: If module_region == mod->init_region, trim exception
191             table entries. */
192  }
193 @@ -214,24 +75,6 @@ void module_free(struct module *mod, voi
194  int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
195                               char *secstrings, struct module *mod)
196  {
197 -       unsigned int symindex = 0;
198 -       unsigned int core_size, init_size;
199 -       int i;
200 -
201 -       for (i = 1; i < hdr->e_shnum; i++)
202 -               if (sechdrs[i].sh_type == SHT_SYMTAB)
203 -                       symindex = i;
204 -
205 -       core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
206 -       init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
207 -
208 -       mod->arch.core_plt_offset = 0;
209 -       mod->arch.core_plt_size = core_size;
210 -       mod->arch.init_plt_offset = core_size;
211 -       mod->arch.plt_tbl = kmalloc(core_size + init_size, GFP_KERNEL);
212 -       if (!mod->arch.plt_tbl)
213 -               return -ENOMEM;
214 -
215         return 0;
216  }
217  
218 @@ -254,41 +97,27 @@ static int apply_r_mips_32_rela(struct m
219         return 0;
220  }
221  
222 -static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
223 -                                void *start, Elf_Addr v)
224 +static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
225  {
226 -       unsigned *tramp = start + *plt_offset;
227 -
228 -       *plt_offset += 4 * sizeof(int);
229 -
230 -       /* adjust carry for addiu */
231 -       if (v & 0x00008000)
232 -               v += 0x10000;
233 -
234 -       tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
235 -       tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
236 -       tramp[2] = 0x03200008;                  /* jr t9 */
237 -       tramp[3] = 0x00000000;                  /* nop */
238 -
239 -       return (Elf_Addr) tramp;
240 -}
241 +       if (v % 4) {
242 +               printk(KERN_ERR "module %s: dangerous relocation\n", me->name);
243 +               return -ENOEXEC;
244 +       }
245  
246 -static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
247 -{
248 -       if (location >= me->module_core &&
249 -           location < me->module_core + me->core_size)
250 -               return add_plt_entry_to(&me->arch.core_plt_offset,
251 -                               me->arch.plt_tbl, v);
252 +       if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
253 +               printk(KERN_ERR
254 +                      "module %s: relocation overflow\n",
255 +                      me->name);
256 +               return -ENOEXEC;
257 +       }
258  
259 -       if (location >= me->module_init &&
260 -           location < me->module_init + me->init_size)
261 -               return add_plt_entry_to(&me->arch.init_plt_offset,
262 -                               me->arch.plt_tbl, v);
263 +       *location = (*location & ~0x03ffffff) |
264 +                   ((*location + (v >> 2)) & 0x03ffffff);
265  
266         return 0;
267  }
268  
269 -static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
270 +static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
271  {
272         if (v % 4) {
273                 printk(KERN_ERR "module %s: dangerous relocation\n", me->name);
274 @@ -296,31 +125,17 @@ static int set_r_mips_26(struct module *
275         }
276  
277         if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
278 -           v = add_plt_entry(me, location, v + (ofs << 2));
279 -               if (!v) {
280 -                       printk(KERN_ERR
281 +               printk(KERN_ERR
282                        "module %s: relocation overflow\n",
283                        me->name);
284 -                       return -ENOEXEC;
285 -               }
286 -               ofs = 0;
287 +               return -ENOEXEC;
288         }
289  
290 -       *location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
291 +       *location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
292  
293         return 0;
294  }
295  
296 -static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
297 -{
298 -       return set_r_mips_26(me, location, *location & 0x03ffffff, v);
299 -}
300 -
301 -static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
302 -{
303 -       return set_r_mips_26(me, location, 0, v);
304 -}
305 -
306  static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
307  {
308         struct mips_hi16 *n;
309 @@ -585,23 +400,11 @@ int module_finalize(const Elf_Ehdr *hdr,
310                 list_add(&me->arch.dbe_list, &dbe_list);
311                 spin_unlock_irq(&dbe_lock);
312         }
313 -
314 -       /* Get rid of the fixup trampoline if we're running the module
315 -        * from physically mapped address space */
316 -       if (me->arch.core_plt_offset == 0 &&
317 -           me->arch.init_plt_offset == me->arch.core_plt_size &&
318 -           is_phys_addr(me->module_core)) {
319 -               kfree(me->arch.plt_tbl);
320 -               me->arch.plt_tbl = NULL;
321 -       }
322 -
323         return 0;
324  }
325  
326  void module_arch_cleanup(struct module *mod)
327  {
328 -       if (mod->arch.plt_tbl)
329 -               kfree(mod->arch.plt_tbl);
330         spin_lock_irq(&dbe_lock);
331         list_del(&mod->arch.dbe_list);
332         spin_unlock_irq(&dbe_lock);