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

Commit 218e763f authored by Gleb Natapov's avatar Gleb Natapov Committed by Marcelo Tosatti
Browse files

KVM: VMX: skip vmx->rmode.vm86_active check on cr0 write if unrestricted guest is enabled 



vmx->rmode.vm86_active is never true is unrestricted guest is enabled.
Make it more explicit that neither enter_pmode() nor enter_rmode() is
called in this case.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 286da415

arch/x86/kvm/vmx.c

+6 −8
Original line number Diff line number Diff line
@@ -2877,9 +2877,6 @@ static void enter_rmode(struct kvm_vcpu *vcpu) 
	unsigned long flags;

	struct vcpu_vmx *vmx = to_vmx(vcpu);



	if (enable_unrestricted_guest)

		return;



	vmx_get_segment(vcpu, &vmx->rmode.segs[VCPU_SREG_TR], VCPU_SREG_TR);

	vmx_get_segment(vcpu, &vmx->rmode.segs[VCPU_SREG_ES], VCPU_SREG_ES);

	vmx_get_segment(vcpu, &vmx->rmode.segs[VCPU_SREG_DS], VCPU_SREG_DS);
@@ -3086,7 +3083,7 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) 
	if (enable_unrestricted_guest)

		hw_cr0 = (cr0 & ~KVM_GUEST_CR0_MASK_UNRESTRICTED_GUEST)

			| KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST;

	else

	else {

		hw_cr0 = (cr0 & ~KVM_GUEST_CR0_MASK) | KVM_VM_CR0_ALWAYS_ON;



		if (vmx->rmode.vm86_active && (cr0 & X86_CR0_PE))
@@ -3094,6 +3091,7 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) 


		if (!vmx->rmode.vm86_active && !(cr0 & X86_CR0_PE))

			enter_rmode(vcpu);

	}



#ifdef CONFIG_X86_64

	if (vcpu->arch.efer & EFER_LME) {