Commit c1f47ebc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'modules-for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux 

Pull module fix from Jessica Yu:
 "When CONFIG_MODULE_UNLOAD=n, module exit sections get sorted into the
  init region of the module in order to satisfy the requirements of
  jump_labels and static_calls.

  Previously, the exit section check was done in module_init_section(),
  but the solution there is not completely arch-indepedent as ARM is a
  special case and supplies its own module_init_section() function.

  Instead of pushing this logic further to the arch-specific code,
  switch to an arch-independent solution to check for module exit
  sections in the core module loader code in layout_sections() instead"

* tag 'modules-for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  module: check for exit sections in layout_sections() instead of module_init_section()
parents 93bb533a 055f23b7

kernel/module.c

+11 −6
Original line number Diff line number Diff line
@@ -2401,6 +2401,15 @@ static long get_offset(struct module *mod, unsigned int *size, 
	return ret;

}



static bool module_init_layout_section(const char *sname)

{

#ifndef CONFIG_MODULE_UNLOAD

	if (module_exit_section(sname))

		return true;

#endif

	return module_init_section(sname);

}



/*

 * Lay out the SHF_ALLOC sections in a way not dissimilar to how ld

 * might -- code, read-only data, read-write data, small data.  Tally
@@ -2435,7 +2444,7 @@ static void layout_sections(struct module *mod, struct load_info *info) 
			if ((s->sh_flags & masks[m][0]) != masks[m][0]

			    || (s->sh_flags & masks[m][1])

			    || s->sh_entsize != ~0UL

			    || module_init_section(sname))

			    || module_init_layout_section(sname))

				continue;

			s->sh_entsize = get_offset(mod, &mod->core_layout.size, s, i);

			pr_debug("\t%s\n", sname);
@@ -2468,7 +2477,7 @@ static void layout_sections(struct module *mod, struct load_info *info) 
			if ((s->sh_flags & masks[m][0]) != masks[m][0]

			    || (s->sh_flags & masks[m][1])

			    || s->sh_entsize != ~0UL

			    || !module_init_section(sname))

			    || !module_init_layout_section(sname))

				continue;

			s->sh_entsize = (get_offset(mod, &mod->init_layout.size, s, i)

					 | INIT_OFFSET_MASK);
@@ -2807,11 +2816,7 @@ void * __weak module_alloc(unsigned long size) 


bool __weak module_init_section(const char *name)

{

#ifndef CONFIG_MODULE_UNLOAD

	return strstarts(name, ".init") || module_exit_section(name);

#else

	return strstarts(name, ".init");

#endif

}



bool __weak module_exit_section(const char *name)