1 --- a/arch/mips/Makefile
2 +++ b/arch/mips/Makefile
3 @@ -93,8 +93,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
4 cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
5 cflags-y += -msoft-float
6 LDFLAGS_vmlinux += -G 0 -static -n -nostdlib
8 KBUILD_AFLAGS_MODULE += -mlong-calls
9 KBUILD_CFLAGS_MODULE += -mlong-calls
11 +KBUILD_AFLAGS_MODULE += -mno-long-calls
12 +KBUILD_CFLAGS_MODULE += -mno-long-calls
15 ifeq ($(CONFIG_RELOCATABLE),y)
16 LDFLAGS_vmlinux += --emit-relocs
17 --- a/arch/mips/include/asm/module.h
18 +++ b/arch/mips/include/asm/module.h
19 @@ -11,6 +11,11 @@ struct mod_arch_specific {
20 const struct exception_table_entry *dbe_start;
21 const struct exception_table_entry *dbe_end;
22 struct mips_hi16 *r_mips_hi16_list;
26 + unsigned int phys_plt_offset;
27 + unsigned int virt_plt_offset;
30 typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
31 --- a/arch/mips/kernel/module.c
32 +++ b/arch/mips/kernel/module.c
33 @@ -44,14 +44,221 @@ struct mips_hi16 {
34 static LIST_HEAD(dbe_list);
35 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 + /* mark all pages except for the last one */
130 + for (p = page; p + 1 < page + (size >> PAGE_SHIFT); ++p)
131 + set_bit(PG_owner_priv_1, &p->flags);
133 + for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
136 + return page_address(page);
140 +static void free_phys(void *ptr)
145 + page = virt_to_page(ptr);
147 + free = test_and_clear_bit(PG_owner_priv_1, &page->flags);
154 void *module_alloc(unsigned long size)
157 return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
158 GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE,
159 __builtin_return_address(0));
166 + ptr = alloc_phys(size);
168 + /* If we failed to allocate physically contiguous memory,
169 + * fall back to regular vmalloc. The module loader code will
170 + * create jump tables to handle long jumps */
172 + return vmalloc(size);
178 +static inline bool is_phys_addr(void *ptr)
181 + return (KSEGX((unsigned long)ptr) == CKSEG0);
183 + return (KSEGX(ptr) == KSEG0);
187 +/* Free memory returned from module_alloc */
188 +void module_memfree(void *module_region)
190 + if (is_phys_addr(module_region))
191 + free_phys(module_region);
193 + vfree(module_region);
196 +static void *__module_alloc(int size, bool phys)
201 + ptr = kmalloc(size, GFP_KERNEL);
203 + ptr = vmalloc(size);
207 +static void __module_free(void *ptr)
209 + if (is_phys_addr(ptr))
215 +int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
216 + char *secstrings, struct module *mod)
218 + unsigned int symindex = 0;
219 + unsigned int core_size, init_size;
222 + mod->arch.phys_plt_offset = 0;
223 + mod->arch.virt_plt_offset = 0;
224 + mod->arch.phys_plt_tbl = NULL;
225 + mod->arch.virt_plt_tbl = NULL;
227 + if (IS_ENABLED(CONFIG_64BIT))
230 + for (i = 1; i < hdr->e_shnum; i++)
231 + if (sechdrs[i].sh_type == SHT_SYMTAB)
234 + core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
235 + init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
237 + if ((core_size + init_size) == 0)
240 + mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
241 + if (!mod->arch.phys_plt_tbl)
244 + mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
245 + if (!mod->arch.virt_plt_tbl) {
246 + __module_free(mod->arch.phys_plt_tbl);
247 + mod->arch.phys_plt_tbl = NULL;
254 int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
256 @@ -65,8 +272,39 @@ static int apply_r_mips_32_rel(struct mo
260 +static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
261 + void *start, Elf_Addr v)
263 + unsigned *tramp = start + *plt_offset;
264 + *plt_offset += 4 * sizeof(int);
266 + /* adjust carry for addiu */
267 + if (v & 0x00008000)
270 + tramp[0] = 0x3c190000 | (v >> 16); /* lui t9, hi16 */
271 + tramp[1] = 0x27390000 | (v & 0xffff); /* addiu t9, t9, lo16 */
272 + tramp[2] = 0x03200008; /* jr t9 */
273 + tramp[3] = 0x00000000; /* nop */
275 + return (Elf_Addr) tramp;
278 +static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
280 + if (is_phys_addr(location))
281 + return add_plt_entry_to(&me->arch.phys_plt_offset,
282 + me->arch.phys_plt_tbl, v);
284 + return add_plt_entry_to(&me->arch.virt_plt_offset,
285 + me->arch.virt_plt_tbl, v);
289 static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
291 + u32 ofs = *location & 0x03ffffff;
294 pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
296 @@ -74,13 +312,17 @@ static int apply_r_mips_26_rel(struct mo
299 if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
300 - pr_err("module %s: relocation overflow\n",
303 + v = add_plt_entry(me, location, v + (ofs << 2));
305 + pr_err("module %s: relocation overflow\n",
312 *location = (*location & ~0x03ffffff) |
313 - ((*location + (v >> 2)) & 0x03ffffff);
314 + ((ofs + (v >> 2)) & 0x03ffffff);
318 @@ -349,9 +591,33 @@ int module_finalize(const Elf_Ehdr *hdr,
319 list_add(&me->arch.dbe_list, &dbe_list);
320 spin_unlock_irq(&dbe_lock);
323 + /* Get rid of the fixup trampoline if we're running the module
324 + * from physically mapped address space */
325 + if (me->arch.phys_plt_offset == 0) {
326 + __module_free(me->arch.phys_plt_tbl);
327 + me->arch.phys_plt_tbl = NULL;
329 + if (me->arch.virt_plt_offset == 0) {
330 + __module_free(me->arch.virt_plt_tbl);
331 + me->arch.virt_plt_tbl = NULL;
337 +void module_arch_freeing_init(struct module *mod)
339 + if (mod->arch.phys_plt_tbl) {
340 + __module_free(mod->arch.phys_plt_tbl);
341 + mod->arch.phys_plt_tbl = NULL;
343 + if (mod->arch.virt_plt_tbl) {
344 + __module_free(mod->arch.virt_plt_tbl);
345 + mod->arch.virt_plt_tbl = NULL;
349 void module_arch_cleanup(struct module *mod)
351 spin_lock_irq(&dbe_lock);