62d0fd591d
As the bug report [1] pointed out, <linux/vermagic.h> must be included after <linux/module.h>. I believe we should not impose any include order restriction. We often sort include directives alphabetically, but it is just coding style convention. Technically, we can include header files in any order by making every header self-contained. Currently, arch-specific MODULE_ARCH_VERMAGIC is defined in <asm/module.h>, which is not included from <linux/vermagic.h>. Hence, the straight-forward fix-up would be as follows: |--- a/include/linux/vermagic.h |+++ b/include/linux/vermagic.h |@@ -1,5 +1,6 @@ | /* SPDX-License-Identifier: GPL-2.0 */ | #include <generated/utsrelease.h> |+#include <linux/module.h> | | /* Simply sanity version stamp for modules. */ | #ifdef CONFIG_SMP This works enough, but for further cleanups, I split MODULE_ARCH_VERMAGIC definitions into <asm/vermagic.h>. With this, <linux/module.h> and <linux/vermagic.h> will be orthogonal, and the location of MODULE_ARCH_VERMAGIC definitions will be consistent. For arc and ia64, MODULE_PROC_FAMILY is only used for defining MODULE_ARCH_VERMAGIC. I squashed it. For hexagon, nds32, and xtensa, I removed <asm/modules.h> entirely because they contained nothing but MODULE_ARCH_VERMAGIC definition. Kbuild will automatically generate <asm/modules.h> at build-time, wrapping <asm-generic/module.h>. [1] https://lore.kernel.org/lkml/20200411155623.GA22175@zn.tnic Reported-by: Borislav Petkov <bp@suse.de> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Acked-by: Jessica Yu <jeyu@kernel.org>
90 lines
2.3 KiB
C
90 lines
2.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
#ifndef _ASM_POWERPC_MODULE_H
|
|
#define _ASM_POWERPC_MODULE_H
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/list.h>
|
|
#include <asm/bug.h>
|
|
#include <asm-generic/module.h>
|
|
|
|
#ifndef __powerpc64__
|
|
/*
|
|
* Thanks to Paul M for explaining this.
|
|
*
|
|
* PPC can only do rel jumps += 32MB, and often the kernel and other
|
|
* modules are further away than this. So, we jump to a table of
|
|
* trampolines attached to the module (the Procedure Linkage Table)
|
|
* whenever that happens.
|
|
*/
|
|
|
|
struct ppc_plt_entry {
|
|
/* 16 byte jump instruction sequence (4 instructions) */
|
|
unsigned int jump[4];
|
|
};
|
|
#endif /* __powerpc64__ */
|
|
|
|
|
|
struct mod_arch_specific {
|
|
#ifdef __powerpc64__
|
|
unsigned int stubs_section; /* Index of stubs section in module */
|
|
unsigned int toc_section; /* What section is the TOC? */
|
|
bool toc_fixed; /* Have we fixed up .TOC.? */
|
|
|
|
/* For module function descriptor dereference */
|
|
unsigned long start_opd;
|
|
unsigned long end_opd;
|
|
#else /* powerpc64 */
|
|
/* Indices of PLT sections within module. */
|
|
unsigned int core_plt_section;
|
|
unsigned int init_plt_section;
|
|
#endif /* powerpc64 */
|
|
|
|
#ifdef CONFIG_DYNAMIC_FTRACE
|
|
unsigned long tramp;
|
|
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
|
|
unsigned long tramp_regs;
|
|
#endif
|
|
#endif
|
|
|
|
/* List of BUG addresses, source line numbers and filenames */
|
|
struct list_head bug_list;
|
|
struct bug_entry *bug_table;
|
|
unsigned int num_bugs;
|
|
};
|
|
|
|
/*
|
|
* Select ELF headers.
|
|
* Make empty section for module_frob_arch_sections to expand.
|
|
*/
|
|
|
|
#ifdef __powerpc64__
|
|
# ifdef MODULE
|
|
asm(".section .stubs,\"ax\",@nobits; .align 3; .previous");
|
|
# endif
|
|
#else
|
|
# ifdef MODULE
|
|
asm(".section .plt,\"ax\",@nobits; .align 3; .previous");
|
|
asm(".section .init.plt,\"ax\",@nobits; .align 3; .previous");
|
|
# endif /* MODULE */
|
|
#endif
|
|
|
|
#ifdef CONFIG_DYNAMIC_FTRACE
|
|
# ifdef MODULE
|
|
asm(".section .ftrace.tramp,\"ax\",@nobits; .align 3; .previous");
|
|
# endif /* MODULE */
|
|
#endif
|
|
|
|
int module_trampoline_target(struct module *mod, unsigned long trampoline,
|
|
unsigned long *target);
|
|
|
|
#ifdef CONFIG_DYNAMIC_FTRACE
|
|
int module_finalize_ftrace(struct module *mod, const Elf_Shdr *sechdrs);
|
|
#else
|
|
static inline int module_finalize_ftrace(struct module *mod, const Elf_Shdr *sechdrs)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _ASM_POWERPC_MODULE_H */
|