]> git.baikalelectronics.ru Git - 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)
committerRadim Krčmář <rkrcmar@redhat.com>
Fri, 29 Apr 2016 12:30:41 +0000 (14:30 +0200)
commitd81f55d009b72396ad64a46ccfdaa2c8b2460ce2
treec702341e5b4f78125261ee6821c693c764e73ff8
parentf158f7db06fa4c4c9e74cb247780c7695f512d0c
KVM: x86: fix ordering of cr0 initialization code in vmx_cpu_reset

Commit ec288368d56a 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: ec288368d56a ("KVM: x86: INIT and reset sequences are different")
Cc: stable@vger.kernel.org
Signed-off-by: Bruce Rogers <brogers@suse.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
arch/x86/kvm/vmx.c