Commit b971880f authored by Babu Moger's avatar Babu Moger Committed by Borislav Petkov
Browse files

x86/Kconfig: Rename UMIP config parameter 



AMD 2nd generation EPYC processors support the UMIP (User-Mode
Instruction Prevention) feature. So, rename X86_INTEL_UMIP to
generic X86_UMIP and modify the text to cover both Intel and AMD.

 [ bp: take of the disabled-features.h copy in tools/ too. ]

Signed-off-by: default avatarBabu Moger <babu.moger@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "x86@kernel.org" <x86@kernel.org>
Link: https://lkml.kernel.org/r/157298912544.17462.2018334793891409521.stgit@naples-babu.amd.com
parent 1edae1ae

arch/x86/Kconfig

+8 −8
Original line number Diff line number Diff line
@@ -1880,16 +1880,16 @@ config X86_SMAP 


	  If unsure, say Y.



config X86_INTEL_UMIP

config X86_UMIP

	def_bool y

	depends on CPU_SUP_INTEL

	prompt "Intel User Mode Instruction Prevention" if EXPERT

	depends on CPU_SUP_INTEL || CPU_SUP_AMD

	prompt "User Mode Instruction Prevention" if EXPERT

	---help---

	  The User Mode Instruction Prevention (UMIP) is a security

	  feature in newer Intel processors. If enabled, a general

	  protection fault is issued if the SGDT, SLDT, SIDT, SMSW

	  or STR instructions are executed in user mode. These instructions

	  unnecessarily expose information about the hardware state.

	  User Mode Instruction Prevention (UMIP) is a security feature in

	  some x86 processors. If enabled, a general protection fault is

	  issued if the SGDT, SLDT, SIDT, SMSW or STR instructions are

	  executed in user mode. These instructions unnecessarily expose

	  information about the hardware state.



	  The vast majority of applications do not use these instructions.

	  For the very few that do, software emulation is provided in

arch/x86/include/asm/disabled-features.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
# define DISABLE_SMAP	(1<<(X86_FEATURE_SMAP & 31))

#endif



#ifdef CONFIG_X86_INTEL_UMIP

#ifdef CONFIG_X86_UMIP

# define DISABLE_UMIP	0

#else

# define DISABLE_UMIP	(1<<(X86_FEATURE_UMIP & 31))

arch/x86/include/asm/umip.h

+2 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
#include <linux/types.h>

#include <asm/ptrace.h>



#ifdef CONFIG_X86_INTEL_UMIP

#ifdef CONFIG_X86_UMIP

bool fixup_umip_exception(struct pt_regs *regs);

#else

static inline bool fixup_umip_exception(struct pt_regs *regs) { return false; }

#endif  /* CONFIG_X86_INTEL_UMIP */

#endif  /* CONFIG_X86_UMIP */

#endif  /* _ASM_X86_UMIP_H */

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ obj-$(CONFIG_EFI) += sysfb_efi.o 
obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o

obj-$(CONFIG_TRACING)			+= tracepoint.o

obj-$(CONFIG_SCHED_MC_PRIO)		+= itmt.o

obj-$(CONFIG_X86_INTEL_UMIP)		+= umip.o

obj-$(CONFIG_X86_UMIP)			+= umip.o



obj-$(CONFIG_UNWINDER_ORC)		+= unwind_orc.o

obj-$(CONFIG_UNWINDER_FRAME_POINTER)	+= unwind_frame.o

tools/arch/x86/include/asm/disabled-features.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
# define DISABLE_SMAP	(1<<(X86_FEATURE_SMAP & 31))

#endif



#ifdef CONFIG_X86_INTEL_UMIP

#ifdef CONFIG_X86_UMIP

# define DISABLE_UMIP	0

#else

# define DISABLE_UMIP	(1<<(X86_FEATURE_UMIP & 31))

CRA Git | Maintained and supported by SUSTech CRA and CCSE