Commit 92d2da37 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge branch 'x86/mm' 



Depends on the simplifications from commit 1d7e707a ("Revert "x86/module: prepare module loading for ROX allocations of text"")

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
parents a64dcfb4 67520477

arch/um/kernel/um_arch.c

+5 −6
Original line number Diff line number Diff line
@@ -440,25 +440,24 @@ void __init arch_cpu_finalize_init(void) 
	os_check_bugs();

}



void apply_seal_endbr(s32 *start, s32 *end, struct module *mod)

void apply_seal_endbr(s32 *start, s32 *end)

{

}



void apply_retpolines(s32 *start, s32 *end, struct module *mod)

void apply_retpolines(s32 *start, s32 *end)

{

}



void apply_returns(s32 *start, s32 *end, struct module *mod)

void apply_returns(s32 *start, s32 *end)

{

}



void apply_fineibt(s32 *start_retpoline, s32 *end_retpoline,

		   s32 *start_cfi, s32 *end_cfi, struct module *mod)

		   s32 *start_cfi, s32 *end_cfi)

{

}



void apply_alternatives(struct alt_instr *start, struct alt_instr *end,

			struct module *mod)

void apply_alternatives(struct alt_instr *start, struct alt_instr *end)

{

}

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ config X86 
	select ARCH_HAS_DMA_OPS			if GART_IOMMU || XEN

	select ARCH_HAS_EARLY_DEBUG		if KGDB

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_EXECMEM_ROX		if X86_64

	select ARCH_HAS_FAST_MULTIPLIER

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

arch/x86/entry/vdso/vma.c

+1 −2
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ int __init init_vdso_image(const struct vdso_image *image) 


	apply_alternatives((struct alt_instr *)(image->data + image->alt),

			   (struct alt_instr *)(image->data + image->alt +

						image->alt_len),

			   NULL);

						image->alt_len));



	return 0;

}

arch/x86/include/asm/alternative.h

+7 −7
Original line number Diff line number Diff line
@@ -87,16 +87,16 @@ extern struct alt_instr __alt_instructions[], __alt_instructions_end[]; 
 * instructions were patched in already:

 */

extern int alternatives_patched;

struct module;



extern void alternative_instructions(void);

extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end,

			       struct module *mod);

extern void apply_retpolines(s32 *start, s32 *end, struct module *mod);

extern void apply_returns(s32 *start, s32 *end, struct module *mod);

extern void apply_seal_endbr(s32 *start, s32 *end, struct module *mod);

extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end);

extern void apply_retpolines(s32 *start, s32 *end);

extern void apply_returns(s32 *start, s32 *end);

extern void apply_seal_endbr(s32 *start, s32 *end);

extern void apply_fineibt(s32 *start_retpoline, s32 *end_retpoine,

			  s32 *start_cfi, s32 *end_cfi, struct module *mod);

			  s32 *start_cfi, s32 *end_cfi);



struct module;



struct callthunk_sites {

	s32				*call_start, *call_end;

arch/x86/include/asm/pgtable_types.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#define _PAGE_BIT_CPA_TEST	_PAGE_BIT_SOFTW1

#define _PAGE_BIT_UFFD_WP	_PAGE_BIT_SOFTW2 /* userfaultfd wrprotected */

#define _PAGE_BIT_SOFT_DIRTY	_PAGE_BIT_SOFTW3 /* software dirty tracking */

#define _PAGE_BIT_KERNEL_4K	_PAGE_BIT_SOFTW3 /* page must not be converted to large */

#define _PAGE_BIT_DEVMAP	_PAGE_BIT_SOFTW4



#ifdef CONFIG_X86_64
@@ -64,6 +65,7 @@ 
#define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)

#define _PAGE_SPECIAL	(_AT(pteval_t, 1) << _PAGE_BIT_SPECIAL)

#define _PAGE_CPA_TEST	(_AT(pteval_t, 1) << _PAGE_BIT_CPA_TEST)

#define _PAGE_KERNEL_4K	(_AT(pteval_t, 1) << _PAGE_BIT_KERNEL_4K)

#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS

#define _PAGE_PKEY_BIT0	(_AT(pteval_t, 1) << _PAGE_BIT_PKEY_BIT0)

#define _PAGE_PKEY_BIT1	(_AT(pteval_t, 1) << _PAGE_BIT_PKEY_BIT1)