]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
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)
committerKamal Mostafa <kamal@canonical.com>
Fri, 10 Jun 2016 13:32:25 +0000 (06:32 -0700)
commit984223314d58c0430a493f490dafd7c2750a78c1
tree2101a188c07eab3bf738686cbcf087a3bcbfc46e
parenta56cdebb2ce0af1233eb9691fc0f27e73b1288ff
KVM: x86: fix ordering of cr0 initialization code in vmx_cpu_reset

BugLink: http://bugs.launchpad.net/bugs/1588945
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>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
arch/x86/kvm/vmx.c