Commit 3398b12d authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge branch 'tip/x86/urgent' 



Merge the x86/urgent objtool/IBT changes as a base

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
parents 4abff6d4 4cdfc11b

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -21434,6 +21434,15 @@ F: arch/x86/include/asm/uv/ 
F:	arch/x86/kernel/apic/x2apic_uv_x.c

F:	arch/x86/platform/uv/









X86 STACK UNWINDING









M:	Josh Poimboeuf <jpoimboe@redhat.com>









M:	Peter Zijlstra <peterz@infradead.org>









S:	Supported









F:	arch/x86/include/asm/unwind*.h









F:	arch/x86/kernel/dumpstack.c









F:	arch/x86/kernel/stacktrace.c









F:	arch/x86/kernel/unwind_*.c

















X86 VDSO









M:	Andy Lutomirski <luto@kernel.org>









L:	linux-kernel@vger.kernel.org

























arch/x86/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -1866,7 +1866,7 @@ config X86_KERNEL_IBT







	  code with them to make this happen.



















	  In addition to building the kernel with IBT, seal all functions that









	  are not indirect call targets, avoiding them ever becomming one.









	  are not indirect call targets, avoiding them ever becoming one.



















	  This requires LTO like objtool runs and will slow down the build. It









	  does significantly reduce the number of ENDBR instructions in the
































arch/x86/entry/entry_64.S



+3
−0






























Original line number
Diff line number
Diff line







@@ -337,6 +337,9 @@ SYM_CODE_END(ret_from_fork)

















	call	\cfunc



















	/* For some configurations \cfunc ends up being a noreturn. */









	REACHABLE



















	jmp	error_return









.endm










































arch/x86/include/asm/intel-family.h



+3
−0






























Original line number
Diff line number
Diff line







@@ -26,6 +26,7 @@







 *		_G	- parts with extra graphics on









 *		_X	- regular server parts









 *		_D	- micro server parts









 *		_N,_P	- other mobile parts









 *









 *		Historical OPTDIFFs:









 *








@@ -107,8 +108,10 @@

















#define INTEL_FAM6_ALDERLAKE		0x97	/* Golden Cove / Gracemont */









#define INTEL_FAM6_ALDERLAKE_L		0x9A	/* Golden Cove / Gracemont */









#define INTEL_FAM6_ALDERLAKE_N		0xBE



















#define INTEL_FAM6_RAPTORLAKE		0xB7









#define INTEL_FAM6_RAPTORLAKE_P		0xBA



















/* "Small Core" Processors (Atom) */










































arch/x86/include/asm/microcode.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -131,10 +131,12 @@ extern void __init load_ucode_bsp(void);







extern void load_ucode_ap(void);









void reload_early_microcode(void);









extern bool initrd_gone;









void microcode_bsp_resume(void);









#else









static inline void __init load_ucode_bsp(void)			{ }









static inline void load_ucode_ap(void)				{ }









static inline void reload_early_microcode(void)			{ }









static inline void microcode_bsp_resume(void)			{ }









#endif



















#endif /* _ASM_X86_MICROCODE_H */