Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 088af9a6 authored by Helge Deller's avatar Helge Deller Committed by Rusty Russell
Browse files

module: fix module loading failure of large kernel modules for parisc 



When creating the final layout of a kernel module in memory, allow the
module loader to reserve some additional memory in front of a given section.
This is currently only needed for the parisc port which needs to put the
stub entries there to fulfill the 17/22bit PCREL relocations with large
kernel modules like xfs.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (renamed fn)
parent d1e99d7a

include/linux/moduleloader.h

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, 
			      char *secstrings,

			      struct module *mod);



/* Additional bytes needed by arch in front of individual sections */

unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);



/* Allocator used for allocating struct module, core sections and init

   sections.  Returns NULL on failure. */

void *module_alloc(unsigned long size);

kernel/module.c

+13 −3
Original line number Diff line number Diff line
@@ -1578,11 +1578,21 @@ static int simplify_symbols(Elf_Shdr *sechdrs, 
	return ret;

}



/* Additional bytes needed by arch in front of individual sections */

unsigned int __weak arch_mod_section_prepend(struct module *mod,

					     unsigned int section)

{

	/* default implementation just returns zero */

	return 0;

}



/* Update size with this section: return offset. */

static long get_offset(unsigned int *size, Elf_Shdr *sechdr)

static long get_offset(struct module *mod, unsigned int *size,

		       Elf_Shdr *sechdr, unsigned int section)

{

	long ret;



	*size += arch_mod_section_prepend(mod, section);

	ret = ALIGN(*size, sechdr->sh_addralign ?: 1);

	*size = ret + sechdr->sh_size;

	return ret;
@@ -1622,7 +1632,7 @@ static void layout_sections(struct module *mod, 
			    || strncmp(secstrings + s->sh_name,

				       ".init", 5) == 0)

				continue;

			s->sh_entsize = get_offset(&mod->core_size, s);

			s->sh_entsize = get_offset(mod, &mod->core_size, s, i);

			DEBUGP("\t%s\n", secstrings + s->sh_name);

		}

		if (m == 0)
@@ -1640,7 +1650,7 @@ static void layout_sections(struct module *mod, 
			    || strncmp(secstrings + s->sh_name,

				       ".init", 5) != 0)

				continue;

			s->sh_entsize = (get_offset(&mod->init_size, s)

			s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)

					 | INIT_OFFSET_MASK);

			DEBUGP("\t%s\n", secstrings + s->sh_name);

		}