Commit fa44b82e authored by Babu Moger's avatar Babu Moger Committed by Paolo Bonzini
Browse files

KVM: x86: Move MPK feature detection to common code 



Both Intel and AMD support (MPK) Memory Protection Key feature.
Move the feature detection from VMX to the common code. It should
work for both the platforms now.

Signed-off-by: default avatarBabu Moger <babu.moger@amd.com>
Message-Id: <158932795627.44260.15144185478040178638.stgit@naples-babu.amd.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 65b18914

arch/x86/kvm/cpuid.c

+8 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ void kvm_set_cpu_caps(void) 
	);



	kvm_cpu_cap_mask(CPUID_7_ECX,

		F(AVX512VBMI) | F(LA57) | 0 /*PKU*/ | 0 /*OSPKE*/ | F(RDPID) |

		F(AVX512VBMI) | F(LA57) | F(PKU) | 0 /*OSPKE*/ | F(RDPID) |

		F(AVX512_VPOPCNTDQ) | F(UMIP) | F(AVX512_VBMI2) | F(GFNI) |

		F(VAES) | F(VPCLMULQDQ) | F(AVX512_VNNI) | F(AVX512_BITALG) |

		F(CLDEMOTE) | F(MOVDIRI) | F(MOVDIR64B) | 0 /*WAITPKG*/
@@ -334,6 +334,13 @@ void kvm_set_cpu_caps(void) 
	if (cpuid_ecx(7) & F(LA57))

		kvm_cpu_cap_set(X86_FEATURE_LA57);



	/*

	 * PKU not yet implemented for shadow paging and requires OSPKE

	 * to be set on the host. Clear it if that is not the case

	 */

	if (!tdp_enabled || !boot_cpu_has(X86_FEATURE_OSPKE))

		kvm_cpu_cap_clear(X86_FEATURE_PKU);



	kvm_cpu_cap_mask(CPUID_7_EDX,

		F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(SPEC_CTRL) |

		F(SPEC_CTRL_SSBD) | F(ARCH_CAPABILITIES) | F(INTEL_STIBP) |

arch/x86/kvm/vmx/vmx.c

+0 −4
Original line number Diff line number Diff line
@@ -7282,10 +7282,6 @@ static __init void vmx_set_cpu_caps(void) 
	if (vmx_pt_mode_is_host_guest())

		kvm_cpu_cap_check_and_set(X86_FEATURE_INTEL_PT);



	/* PKU is not yet implemented for shadow paging. */

	if (enable_ept && boot_cpu_has(X86_FEATURE_OSPKE))

		kvm_cpu_cap_check_and_set(X86_FEATURE_PKU);



	if (vmx_umip_emulated())

		kvm_cpu_cap_set(X86_FEATURE_UMIP);