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

Commit 95eb84a7 authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

KVM: VMX: Fix EPT with WP bit change during paging 



QNX update WP bit when paging enabled, which is not covered yet. This one fix
QNX boot with EPT.

Cc: stable@kernel.org
Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d9048d32

arch/x86/kvm/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -1642,7 +1642,6 @@ static void ept_update_paging_mode_cr0(unsigned long *hw_cr0, 
			      CPU_BASED_CR3_STORE_EXITING));

		vcpu->arch.cr0 = cr0;

		vmx_set_cr4(vcpu, vcpu->arch.cr4);

		*hw_cr0 &= ~X86_CR0_WP;

	} else if (!is_paging(vcpu)) {

		/* From nonpaging to paging */

		vmcs_write32(CPU_BASED_VM_EXEC_CONTROL,
@@ -1651,9 +1650,10 @@ static void ept_update_paging_mode_cr0(unsigned long *hw_cr0, 
			       CPU_BASED_CR3_STORE_EXITING));

		vcpu->arch.cr0 = cr0;

		vmx_set_cr4(vcpu, vcpu->arch.cr4);

		if (!(vcpu->arch.cr0 & X86_CR0_WP))

			*hw_cr0 &= ~X86_CR0_WP;

	}



	if (!(cr0 & X86_CR0_WP))

		*hw_cr0 &= ~X86_CR0_WP;

}



static void ept_update_paging_mode_cr4(unsigned long *hw_cr4,