The following commit has been merged into the x86/build branch of tip: Commit-ID: 38f3e775e9c242f5430a9c08c11be7577f63a41c Gitweb: https://git.kernel.org/tip/38f3e775e9c242f5430a9c08c11be7577f63a41c Author: Babu Moger <[email protected]> AuthorDate: Thu, 28 May 2020 11:08:23 -05:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 28 May 2020 18:27:40 +02:00
x86/Kconfig: Update config and kernel doc for MPK feature on AMD AMD's next generation of EPYC processors support the MPK (Memory Protection Keys) feature. Update the dependency and documentation. Signed-off-by: Babu Moger <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Reviewed-by: Dave Hansen <[email protected]> Link: https://lkml.kernel.org/r/159068199556.26992.17733929401377275140.st...@naples-babu.amd.com --- Documentation/core-api/protection-keys.rst | 5 +++-- arch/x86/Kconfig | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/core-api/protection-keys.rst b/Documentation/core-api/protection-keys.rst index 49d9833..ec575e7 100644 --- a/Documentation/core-api/protection-keys.rst +++ b/Documentation/core-api/protection-keys.rst @@ -5,8 +5,9 @@ Memory Protection Keys ====================== Memory Protection Keys for Userspace (PKU aka PKEYs) is a feature -which is found on Intel's Skylake "Scalable Processor" Server CPUs. -It will be avalable in future non-server parts. +which is found on Intel's Skylake (and later) "Scalable Processor" +Server CPUs. It will be available in future non-server Intel parts +and future AMD processors. For anyone wishing to test or use this feature, it is available in Amazon's EC2 C5 instances and is known to work there using an Ubuntu diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1d6104e..968d23f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1887,10 +1887,10 @@ config X86_UMIP results are dummy. config X86_INTEL_MEMORY_PROTECTION_KEYS - prompt "Intel Memory Protection Keys" + prompt "Memory Protection Keys" def_bool y # Note: only available in 64-bit mode - depends on CPU_SUP_INTEL && X86_64 + depends on X86_64 && (CPU_SUP_INTEL || CPU_SUP_AMD) select ARCH_USES_HIGH_VMA_FLAGS select ARCH_HAS_PKEYS ---help---
