KVM: x86: fix ordering of cr0 initialization code in vmx_cpu_reset
authorBruce Rogers <brogers@suse.com>
Thu, 28 Apr 2016 20:49:21 +0000 (14:49 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Jun 2016 19:17:01 +0000 (12:17 -0700)
commitdc7ecfc8bc1e86990f83e5ee3a7fb5471f5dea7a
treef91b595cfa0f06726052ceba3cf255044ca4d52d
parent2aecd84724e43ea2f962ba54e10b9f304c258d16
KVM: x86: fix ordering of cr0 initialization code in vmx_cpu_reset

commit f24632475d4ffed5626abbfab7ef30a128dd1474 upstream.

Commit d28bc9dd25ce reversed the order of two lines which initialize cr0,
allowing the current (old) cr0 value to mess up vcpu initialization.
This was observed in the checks for cr0 X86_CR0_WP bit in the context of
kvm_mmu_reset_context(). Besides, setting vcpu->arch.cr0 after vmx_set_cr0()
is completely redundant. Change the order back to ensure proper vcpu
initialization.

The combination of booting with ovmf firmware when guest vcpus > 1 and kvm's
ept=N option being set results in a VM-entry failure. This patch fixes that.

Fixes: d28bc9dd25ce ("KVM: x86: INIT and reset sequences are different")
Signed-off-by: Bruce Rogers <brogers@suse.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kvm/vmx.c