Commit ddba2628 authored by Huaitong Han's avatar Huaitong Han Committed by Paolo Bonzini

KVM, pkeys: disable pkeys for guests in non-paging mode

Pkeys is disabled if CPU is in non-paging mode in hardware. However KVM
always uses paging mode to emulate guest non-paging, mode with TDP. To
emulate this behavior, pkeys needs to be manually disabled when guest
switches to non-paging mode.
Signed-off-by: default avatarHuaitong Han <huaitong.han@intel.com>
Reviewed-by: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e0b18ef7
...@@ -3893,13 +3893,17 @@ static int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) ...@@ -3893,13 +3893,17 @@ static int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
if (!enable_unrestricted_guest && !is_paging(vcpu)) if (!enable_unrestricted_guest && !is_paging(vcpu))
/* /*
* SMEP/SMAP is disabled if CPU is in non-paging mode in * SMEP/SMAP/PKU is disabled if CPU is in non-paging mode in
* hardware. However KVM always uses paging mode without * hardware. To emulate this behavior, SMEP/SMAP/PKU needs
* unrestricted guest. * to be manually disabled when guest switches to non-paging
* To emulate this behavior, SMEP/SMAP needs to be manually * mode.
* disabled when guest switches to non-paging mode. *
* If !enable_unrestricted_guest, the CPU is always running
* with CR0.PG=1 and CR4 needs to be modified.
* If enable_unrestricted_guest, the CPU automatically
* disables SMEP/SMAP/PKU when the guest sets CR0.PG=0.
*/ */
hw_cr4 &= ~(X86_CR4_SMEP | X86_CR4_SMAP); hw_cr4 &= ~(X86_CR4_SMEP | X86_CR4_SMAP | X86_CR4_PKE);
vmcs_writel(CR4_READ_SHADOW, cr4); vmcs_writel(CR4_READ_SHADOW, cr4);
vmcs_writel(GUEST_CR4, hw_cr4); vmcs_writel(GUEST_CR4, hw_cr4);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment