1 Index: linux-2.6.30.4/arch/mips/Makefile
2 ===================================================================
3 --- linux-2.6.30.4.orig/arch/mips/Makefile 2009-08-06 16:02:25.000000000 +0200
4 +++ linux-2.6.30.4/arch/mips/Makefile 2009-08-06 16:02:37.000000000 +0200
6 cflags-y += -G 0 -mno-abicalls -fno-pic -pipe
7 cflags-y += -msoft-float
8 LDFLAGS_vmlinux += -G 0 -static -n -nostdlib
9 -MODFLAGS += -mlong-calls
10 +MODFLAGS += -mno-long-calls
12 cflags-y += -ffreestanding
14 Index: linux-2.6.30.4/arch/mips/include/asm/module.h
15 ===================================================================
16 --- linux-2.6.30.4.orig/arch/mips/include/asm/module.h 2009-08-06 16:02:25.000000000 +0200
17 +++ linux-2.6.30.4/arch/mips/include/asm/module.h 2009-08-06 16:02:37.000000000 +0200
19 struct list_head dbe_list;
20 const struct exception_table_entry *dbe_start;
21 const struct exception_table_entry *dbe_end;
24 + unsigned int core_plt_offset;
25 + unsigned int core_plt_size;
26 + unsigned int init_plt_offset;
29 typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
30 Index: linux-2.6.30.4/arch/mips/kernel/module.c
31 ===================================================================
32 --- linux-2.6.30.4.orig/arch/mips/kernel/module.c 2009-08-06 16:02:36.000000000 +0200
33 +++ linux-2.6.30.4/arch/mips/kernel/module.c 2009-08-06 16:03:15.000000000 +0200
35 static LIST_HEAD(dbe_list);
36 static DEFINE_SPINLOCK(dbe_lock);
39 + * Get the potential max trampolines size required of the init and
40 + * non-init sections. Only used if we cannot find enough contiguous
41 + * physically mapped memory to put the module into.
44 +get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
45 + const char *secstrings, unsigned int symindex, bool is_init)
47 + unsigned long ret = 0;
51 + /* Everything marked ALLOC (this includes the exported symbols) */
52 + for (i = 1; i < hdr->e_shnum; ++i) {
53 + unsigned int info = sechdrs[i].sh_info;
55 + if (sechdrs[i].sh_type != SHT_REL
56 + && sechdrs[i].sh_type != SHT_RELA)
59 + /* Not a valid relocation section? */
60 + if (info >= hdr->e_shnum)
63 + /* Don't bother with non-allocated sections */
64 + if (!(sechdrs[info].sh_flags & SHF_ALLOC))
67 + /* If it's called *.init*, and we're not init, we're
69 + if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
73 + syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
74 + if (sechdrs[i].sh_type == SHT_REL) {
75 + Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
76 + unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
78 + for (j = 0; j < size; ++j) {
81 + if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
84 + sym = syms + ELF_MIPS_R_SYM(rel[j]);
85 + if (!is_init && sym->st_shndx != SHN_UNDEF)
88 + ret += 4 * sizeof(int);
91 + Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
92 + unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
94 + for (j = 0; j < size; ++j) {
97 + if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
100 + sym = syms + ELF_MIPS_R_SYM(rela[j]);
101 + if (!is_init && sym->st_shndx != SHN_UNDEF)
104 + ret += 4 * sizeof(int);
112 +#ifndef MODULE_START
113 +static void *alloc_phys(unsigned long size)
119 + size = PAGE_ALIGN(size);
120 + order = get_order(size);
122 + page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
123 + __GFP_THISNODE, order);
127 + split_page(page, order);
129 + for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
132 + return page_address(page);
136 +static void free_phys(void *ptr, unsigned long size)
141 + page = virt_to_page(ptr);
142 + end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
144 + for (; page < end; ++page)
148 void *module_alloc(unsigned long size)
153 return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
159 - return vmalloc(size);
161 + ptr = alloc_phys(size);
163 + /* If we failed to allocate physically contiguous memory,
164 + * fall back to regular vmalloc. The module loader code will
165 + * create jump tables to handle long jumps */
167 + return vmalloc(size);
173 +static inline bool is_phys_addr(void *ptr)
176 + return (KSEGX((unsigned long)ptr) == CKSEG0);
178 + return (KSEGX(ptr) == KSEG0);
182 /* Free memory returned from module_alloc */
183 void module_free(struct module *mod, void *module_region)
185 - vfree(module_region);
186 + if (is_phys_addr(module_region)) {
187 + if (mod->module_init == module_region)
188 + free_phys(module_region, mod->init_size);
189 + else if (mod->module_core == module_region)
190 + free_phys(module_region, mod->core_size);
194 + vfree(module_region);
196 /* FIXME: If module_region == mod->init_region, trim exception
200 int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
201 char *secstrings, struct module *mod)
203 + unsigned int symindex = 0;
204 + unsigned int core_size, init_size;
207 + for (i = 1; i < hdr->e_shnum; i++)
208 + if (sechdrs[i].sh_type == SHT_SYMTAB)
211 + core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
212 + init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
214 + mod->arch.core_plt_offset = 0;
215 + mod->arch.core_plt_size = core_size;
216 + mod->arch.init_plt_offset = core_size;
217 + mod->arch.plt_tbl = kmalloc(core_size + init_size, GFP_KERNEL);
218 + if (!mod->arch.plt_tbl)
228 -static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
229 +static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
230 + void *start, Elf_Addr v)
233 - printk(KERN_ERR "module %s: dangerous relocation\n", me->name);
236 + unsigned *tramp = start + *plt_offset;
238 - if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
240 - "module %s: relocation overflow\n",
244 + *plt_offset += 4 * sizeof(int);
246 + /* adjust carry for addiu */
247 + if (v & 0x00008000)
250 + tramp[0] = 0x3c190000 | (v >> 16); /* lui t9, hi16 */
251 + tramp[1] = 0x27390000 | (v & 0xffff); /* addiu t9, t9, lo16 */
252 + tramp[2] = 0x03200008; /* jr t9 */
253 + tramp[3] = 0x00000000; /* nop */
255 - *location = (*location & ~0x03ffffff) |
256 - ((*location + (v >> 2)) & 0x03ffffff);
257 + return (Elf_Addr) tramp;
260 +static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
262 + if (location >= me->module_core &&
263 + location < me->module_core + me->core_size)
264 + return add_plt_entry_to(&me->arch.core_plt_offset,
265 + me->arch.plt_tbl, v);
267 + if (location >= me->module_init &&
268 + location < me->module_init + me->init_size)
269 + return add_plt_entry_to(&me->arch.init_plt_offset,
270 + me->arch.plt_tbl, v);
275 -static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
276 +static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
279 printk(KERN_ERR "module %s: dangerous relocation\n", me->name);
280 @@ -125,17 +296,31 @@
283 if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
285 + v = add_plt_entry(me, location, v + (ofs << 2));
288 "module %s: relocation overflow\n",
296 - *location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
297 + *location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
302 +static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
304 + return set_r_mips_26(me, location, *location & 0x03ffffff, v);
307 +static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
309 + return set_r_mips_26(me, location, 0, v);
312 static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
315 @@ -400,11 +585,23 @@
316 list_add(&me->arch.dbe_list, &dbe_list);
317 spin_unlock_irq(&dbe_lock);
320 + /* Get rid of the fixup trampoline if we're running the module
321 + * from physically mapped address space */
322 + if (me->arch.core_plt_offset == 0 &&
323 + me->arch.init_plt_offset == me->arch.core_plt_size &&
324 + is_phys_addr(me->module_core)) {
325 + kfree(me->arch.plt_tbl);
326 + me->arch.plt_tbl = NULL;
332 void module_arch_cleanup(struct module *mod)
334 + if (mod->arch.plt_tbl)
335 + kfree(mod->arch.plt_tbl);
336 spin_lock_irq(&dbe_lock);
337 list_del(&mod->arch.dbe_list);
338 spin_unlock_irq(&dbe_lock);