module: replace module_layout with module_memory
module_layout manages different types of memory (text, data, rodata, etc.) in one allocation, which is problematic for some reasons: 1. It is hard to enable CONFIG_STRICT_MODULE_RWX. 2. It is hard to use huge pages in modules (and not break strict rwx). 3. Many archs uses module_layout for arch-specific data, but it is not obvious how these data are used (are they RO, RX, or RW?) Improve the scenario by replacing 2 (or 3) module_layout per module with up to 7 module_memory per module: MOD_TEXT, MOD_DATA, MOD_RODATA, MOD_RO_AFTER_INIT, MOD_INIT_TEXT, MOD_INIT_DATA, MOD_INIT_RODATA, and allocating them separately. This adds slightly more entries to mod_tree (from up to 3 entries per module, to up to 7 entries per module). However, this at most adds a small constant overhead to __module_address(), which is expected to be fast. Various archs use module_layout for different data. These data are put into different module_memory based on their location in module_layout. IOW, data that used to go with text is allocated with MOD_MEM_TYPE_TEXT; data that used to go with data is allocated with MOD_MEM_TYPE_DATA, etc. module_memory simplifies quite some of the module code. For example, ARCH_WANTS_MODULES_DATA_IN_VMALLOC is a lot cleaner, as it just uses a different allocator for the data. kernel/module/strict_rwx.c is also much cleaner with module_memory. Signed-off-by:Song Liu <song@kernel.org> Cc: Luis Chamberlain <mcgrof@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Guenter Roeck <linux@roeck-us.net> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Reviewed-by:
Thomas Gleixner <tglx@linutronix.de> Reviewed-by:
Christophe Leroy <christophe.leroy@csgroup.eu> Reviewed-by:
Luis Chamberlain <mcgrof@kernel.org> Signed-off-by:
Luis Chamberlain <mcgrof@kernel.org>
Showing
- arch/arc/kernel/unwind.c 7 additions, 5 deletionsarch/arc/kernel/unwind.c
- arch/arm/kernel/module-plts.c 2 additions, 7 deletionsarch/arm/kernel/module-plts.c
- arch/arm64/kernel/module-plts.c 4 additions, 9 deletionsarch/arm64/kernel/module-plts.c
- arch/ia64/kernel/module.c 14 additions, 10 deletionsarch/ia64/kernel/module.c
- arch/mips/kernel/vpe.c 5 additions, 6 deletionsarch/mips/kernel/vpe.c
- arch/parisc/kernel/module.c 17 additions, 34 deletionsarch/parisc/kernel/module.c
- arch/powerpc/kernel/module_32.c 3 additions, 4 deletionsarch/powerpc/kernel/module_32.c
- arch/s390/kernel/module.c 14 additions, 12 deletionsarch/s390/kernel/module.c
- arch/x86/kernel/callthunks.c 2 additions, 2 deletionsarch/x86/kernel/callthunks.c
- arch/x86/kernel/module.c 2 additions, 2 deletionsarch/x86/kernel/module.c
- include/linux/module.h 63 additions, 26 deletionsinclude/linux/module.h
- kernel/module/internal.h 17 additions, 23 deletionskernel/module/internal.h
- kernel/module/kallsyms.c 33 additions, 25 deletionskernel/module/kallsyms.c
- kernel/module/kdb.c 9 additions, 8 deletionskernel/module/kdb.c
- kernel/module/main.c 189 additions, 186 deletionskernel/module/main.c
- kernel/module/procfs.c 11 additions, 5 deletionskernel/module/procfs.c
- kernel/module/strict_rwx.c 18 additions, 81 deletionskernel/module/strict_rwx.c
- kernel/module/tree_lookup.c 17 additions, 22 deletionskernel/module/tree_lookup.c
Loading
Please register or sign in to comment