Commit acfdf34c authored by Oliver Upton's avatar Oliver Upton
Browse files

Merge branch for-next/module-alloc into kvmarm/next 



* for-next/module-alloc:
  : Drag in module VA rework to handle conflicts w/ sw feature refactor
  arm64: module: rework module VA range selection
  arm64: module: mandate MODULE_PLTS
  arm64: module: move module randomization to module.c
  arm64: kaslr: split kaslr/module initialization
  arm64: kasan: remove !KASAN_VMALLOC remnants
  arm64: module: remove old !KASAN_VMALLOC logic

Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parents b710fe0d 3e35d303

Documentation/arm64/memory.rst

+4 −4
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ AArch64 Linux memory layout with 4KB pages + 4 levels (48-bit):: 
  0000000000000000	0000ffffffffffff	 256TB		user

  ffff000000000000	ffff7fffffffffff	 128TB		kernel logical memory map

 [ffff600000000000	ffff7fffffffffff]	  32TB		[kasan shadow region]

  ffff800000000000	ffff800007ffffff	 128MB		modules

  ffff800008000000	fffffbffefffffff	 124TB		vmalloc

  ffff800000000000	ffff80007fffffff	   2GB		modules

  ffff800080000000	fffffbffefffffff	 124TB		vmalloc

  fffffbfff0000000	fffffbfffdffffff	 224MB		fixed mappings (top down)

  fffffbfffe000000	fffffbfffe7fffff	   8MB		[guard region]

  fffffbfffe800000	fffffbffff7fffff	  16MB		PCI I/O space
@@ -50,8 +50,8 @@ AArch64 Linux memory layout with 64KB pages + 3 levels (52-bit with HW support): 
  0000000000000000	000fffffffffffff	   4PB		user

  fff0000000000000	ffff7fffffffffff	  ~4PB		kernel logical memory map

 [fffd800000000000	ffff7fffffffffff]	 512TB		[kasan shadow region]

  ffff800000000000	ffff800007ffffff	 128MB		modules

  ffff800008000000	fffffbffefffffff	 124TB		vmalloc

  ffff800000000000	ffff80007fffffff	   2GB		modules

  ffff800080000000	fffffbffefffffff	 124TB		vmalloc

  fffffbfff0000000	fffffbfffdffffff	 224MB		fixed mappings (top down)

  fffffbfffe000000	fffffbfffe7fffff	   8MB		[guard region]

  fffffbfffe800000	fffffbffff7fffff	  16MB		PCI I/O space

arch/arm64/Kconfig

+3 −25
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ config ARM64 
	select HAVE_IOREMAP_PROT

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_KVM

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI

	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS
@@ -577,7 +578,6 @@ config ARM64_ERRATUM_845719 
config ARM64_ERRATUM_843419

	bool "Cortex-A53: 843419: A load or store might access an incorrect address"

	default y

	select ARM64_MODULE_PLTS if MODULES

	help

	  This option links the kernel with '--fix-cortex-a53-843419' and

	  enables PLT support to replace certain ADRP instructions, which can
@@ -2107,26 +2107,6 @@ config ARM64_SME 
	  register state capable of holding two dimensional matrix tiles to

	  enable various matrix operations.



config ARM64_MODULE_PLTS

	bool "Use PLTs to allow module memory to spill over into vmalloc area"

	depends on MODULES

	select HAVE_MOD_ARCH_SPECIFIC

	help

	  Allocate PLTs when loading modules so that jumps and calls whose

	  targets are too far away for their relative offsets to be encoded

	  in the instructions themselves can be bounced via veneers in the

	  module's PLT. This allows modules to be allocated in the generic

	  vmalloc area after the dedicated module memory area has been

	  exhausted.



	  When running with address space randomization (KASLR), the module

	  region itself may be too far away for ordinary relative jumps and

	  calls, and so in that case, module PLTs are required and cannot be

	  disabled.



	  Specific errata workaround(s) might also force module PLTs to be

	  enabled (ARM64_ERRATUM_843419).



config ARM64_PSEUDO_NMI

	bool "Support for NMI-like interrupts"

	select ARM_GIC_V3
@@ -2167,7 +2147,6 @@ config RELOCATABLE 


config RANDOMIZE_BASE

	bool "Randomize the address of the kernel image"

	select ARM64_MODULE_PLTS if MODULES

	select RELOCATABLE

	help

	  Randomizes the virtual address at which the kernel image is
@@ -2198,9 +2177,8 @@ config RANDOMIZE_MODULE_REGION_FULL 
	  When this option is not set, the module region will be randomized over

	  a limited range that contains the [_stext, _etext] interval of the

	  core kernel, so branch relocations are almost always in range unless

	  ARM64_MODULE_PLTS is enabled and the region is exhausted. In this

	  particular case of region exhaustion, modules might be able to fall

	  back to a larger 2GB area.

	  the region is exhausted. In this particular case of region

	  exhaustion, modules might be able to fall back to a larger 2GB area.



config CC_HAVE_STACKPROTECTOR_SYSREG

	def_bool $(cc-option,-mstack-protector-guard=sysreg -mstack-protector-guard-reg=sp_el0 -mstack-protector-guard-offset=0)

arch/arm64/include/asm/memory.h

+9 −7
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#define KIMAGE_VADDR		(MODULES_END)

#define MODULES_END		(MODULES_VADDR + MODULES_VSIZE)

#define MODULES_VADDR		(_PAGE_END(VA_BITS_MIN))

#define MODULES_VSIZE		(SZ_128M)

#define MODULES_VSIZE		(SZ_2G)

#define VMEMMAP_START		(-(UL(1) << (VA_BITS - VMEMMAP_SHIFT)))

#define VMEMMAP_END		(VMEMMAP_START + VMEMMAP_SIZE)

#define PCI_IO_END		(VMEMMAP_START - SZ_8M)
@@ -204,15 +204,17 @@ static inline unsigned long kaslr_offset(void) 
	return kimage_vaddr - KIMAGE_VADDR;

}



#ifdef CONFIG_RANDOMIZE_BASE

void kaslr_init(void);

static inline bool kaslr_enabled(void)

{

	/*

	 * The KASLR offset modulo MIN_KIMG_ALIGN is taken from the physical

	 * placement of the image rather than from the seed, so a displacement

	 * of less than MIN_KIMG_ALIGN means that no seed was provided.

	 */

	return kaslr_offset() >= MIN_KIMG_ALIGN;

	extern bool __kaslr_is_enabled;

	return __kaslr_is_enabled;

}

#else

static inline void kaslr_init(void) { }

static inline bool kaslr_enabled(void) { return false; }

#endif



/*

 * Allow all memory at the discovery stage. We will clip it later.

arch/arm64/include/asm/module.h

+0 −8
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


#include <asm-generic/module.h>



#ifdef CONFIG_ARM64_MODULE_PLTS

struct mod_plt_sec {

	int			plt_shndx;

	int			plt_num_entries;
@@ -21,7 +20,6 @@ struct mod_arch_specific { 
	/* for CONFIG_DYNAMIC_FTRACE */

	struct plt_entry	*ftrace_trampolines;

};

#endif



u64 module_emit_plt_entry(struct module *mod, Elf64_Shdr *sechdrs,

			  void *loc, const Elf64_Rela *rela,
@@ -30,12 +28,6 @@ u64 module_emit_plt_entry(struct module *mod, Elf64_Shdr *sechdrs, 
u64 module_emit_veneer_for_adrp(struct module *mod, Elf64_Shdr *sechdrs,

				void *loc, u64 val);



#ifdef CONFIG_RANDOMIZE_BASE

extern u64 module_alloc_base;

#else

#define module_alloc_base	((u64)_etext - MODULES_VSIZE)

#endif



struct plt_entry {

	/*

	 * A program that conforms to the AArch64 Procedure Call Standard

arch/arm64/include/asm/module.lds.h

+0 −2
Original line number Diff line number Diff line 
SECTIONS {

#ifdef CONFIG_ARM64_MODULE_PLTS

	.plt 0 : { BYTE(0) }

	.init.plt 0 : { BYTE(0) }

	.text.ftrace_trampoline 0 : { BYTE(0) }

#endif



#ifdef CONFIG_KASAN_SW_TAGS

	/*