Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1706bd0c authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: VMX: remove CR0.WP from ..._ALWAYS_ON_UNRESTRICTED_GUEST 



Unrestricted guest can only be enabled when EPT is enabled, and
when EPT is enabled, ept_update_paging_mode_cr0() will clear
hardware CR0.WP based on the guest's CR0.WP, i.e. CR0.WP always
follows the guest's value when unrestricted guest is enabled.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent e90008df

arch/x86/kvm/vmx.c

+4 −3
Original line number Diff line number Diff line
@@ -131,9 +131,10 @@ module_param_named(preemption_timer, enable_preemption_timer, bool, S_IRUGO); 
#endif



#define KVM_GUEST_CR0_MASK (X86_CR0_NW | X86_CR0_CD)

#define KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST (X86_CR0_WP | X86_CR0_NE)

#define KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST X86_CR0_NE

#define KVM_VM_CR0_ALWAYS_ON				\

	(KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST | X86_CR0_PG | X86_CR0_PE)

	(KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST | 	\

	 X86_CR0_WP | X86_CR0_PG | X86_CR0_PE)

#define KVM_CR4_GUEST_OWNED_BITS				      \

	(X86_CR4_PVI | X86_CR4_DE | X86_CR4_PCE | X86_CR4_OSFXSR      \

	 | X86_CR4_OSXMMEXCPT | X86_CR4_LA57 | X86_CR4_TSD)