x86/cpufeatures: Mark ENQCMD as disabled when configured out (1478b99a) · Commits · 戴 / test

Currently, the ENQCMD feature depends on CONFIG_IOMMU_SUPPORT. Add X86_FEATURE_ENQCMD to the disabled features mask so that it gets disabled when the IOMMU config option above is not enabled. Signed-off-by:

Fenghua Yu <fenghua.yu@intel.com> Signed-off-by:

Borislav Petkov <bp@suse.de> Reviewed-by:

Tony Luck <tony.luck@intel.com> Link: https://lkml.kernel.org/r/1600187413-163670-9-git-send-email-fenghua.yu@intel.com

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,12 @@
		# define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31))
		#endif

		#ifdef CONFIG_IOMMU_SUPPORT
		# define DISABLE_ENQCMD 0
		#else
		# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31))
		#endif

		/*
		* Make sure to add features to the correct mask
		*/
		@@ -75,7 +81,8 @@
		#define DISABLED_MASK13 0
		#define DISABLED_MASK14 0
		#define DISABLED_MASK15 0
		#define DISABLED_MASK16 (DISABLE_PKU\|DISABLE_OSPKE\|DISABLE_LA57\|DISABLE_UMIP)
		#define DISABLED_MASK16 (DISABLE_PKU\|DISABLE_OSPKE\|DISABLE_LA57\|DISABLE_UMIP\| \
		DISABLE_ENQCMD)
		#define DISABLED_MASK17 0
		#define DISABLED_MASK18 0
		#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)

Admin message