kvm: fix cr0 initialization on SIPI reset
cover kvm: fix cr0 initialization on SIPI reset
Hi,
The following patches fix a bug on the SIPI reset code for SVM. cr0 was not being reset properly, making KVM keep the vcpu on paging mode, thus not being able to run the real-mode boostrap code. This bug was reported at:
https://bugzilla.redhat.com/show_bug.cgi?id=525699
The first patch is cosmetic, and it just changes the vmx code to use the same macros when initializing cr0, instead of a hardcoded hex value.
The patches were tested by running a RHEL-5.4 guest and and triggering the SIPI reset by offlining and onlining cpus on the guest. They were tested on both NPT-enabled and NPT-disabled cases.
Signature · 1 line
Eduardo
PATCH 1/3 kvm: vmx: use macros instead of hex value on cr0 initialization
This should have no effect, it is just to make the code clearer.
--- arch/x86/kvm/vmx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kvm/vmx.c +1 -1
@@ -2538,7 +2538,7 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)if (vmx->vpid !=0 )vmcs_write16 (VIRTUAL_PROCESSOR_ID , vmx->vpid); - vmx->vcpu.arch.cr0 =0x60000010 ; + vmx->vcpu.arch.cr0 =X86_CR0_NW |X86_CR0_CD |X86_CR0_ET ;vmx_set_cr0 (&vmx->vcpu, vmx->vcpu.arch.cr0);/* enter rmode */ vmx_set_cr4 (&vmx->vcpu,0 );vmx_set_efer (&vmx->vcpu,0 );
Signature · 1 line
1.6.3.rc4.29.g8146
PATCH 2/3 kvm: svm: reset cr0 properly on vcpu reset
In reply to Eduardo Habkostsvm_vcpu_reset() was not properly resetting the contents of the guest-visible cr0 register, causing the following issue:
https://bugzilla.redhat.com/show_bug.cgi?id=525699
Without resetting cr0 properly, the vcpu was running the SIPI bootstrap routine with paging enabled, making the vcpu get a pagefault exception while trying to run it.
Instead of setting vmcb->save.cr0 directly, the new code just resets kvm->arch.cr0 and calls kvm_set_cr0(). The bits that were set/cleared on vmcb->save.cr0 (PG, WP, !CD, !NW) will be set properly by svm_set_cr0().
kvm_set_cr0() is used instead of calling svm_set_cr0() directly to make sure kvm_mmu_reset_context() is called to reset the mmu to nonpaging mode.
--- arch/x86/kvm/svm.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
arch/x86/kvm/svm.c +5 -4
@@ -626,11 +626,12 @@ static void init_vmcb(struct vcpu_svm *svm) save->rip =0x0000fff0 ; svm->vcpu.arch.regs[VCPU_REGS_RIP ] = save->rip; -/* -* cr0 val on cpu init should be 0x60000010, we enable cpu -* cache by default. the orderly way is to enable cache in bios. +/* This is the guest-visible cr0 value. +* svm_set_cr0() sets PG and WP and clears NW and CD on save->cr0. */ - save->cr0 =0x00000010 |X86_CR0_PG |X86_CR0_WP ; + svm->vcpu.arch.cr0 =X86_CR0_NW |X86_CR0_CD |X86_CR0_ET ; +kvm_set_cr0 (&svm->vcpu, svm->vcpu.arch.cr0); + save->cr4 =X86_CR4_PAE ;/* rdx = ?? */
Signature · 1 line
1.6.3.rc4.29.g8146
Re: [PATCH 2/3] kvm: svm: reset cr0 properly on vcpu reset
Quoted 8 lines · Eduardo Habkost
svm_vcpu_reset()was not properly resetting the contents of the guest-visible cr0 register, causing the following issue:
https://bugzilla.redhat.com/show_bug.cgi?id=525699Without resetting cr0 properly, the vcpu was running the SIPI bootstrap routine with paging enabled, making the vcpu get a pagefault exception while trying to run it.
Quoted 9 lines
Instead of setting
vmcb->save.cr0directly, the new code just resetskvm->arch.cr0and callskvm_set_cr0(). The bits that were set/cleared onvmcb->save.cr0(PG, WP, !CD, !NW) will be set properly bysvm_set_cr0().
kvm_set_cr0()is used instead of callingsvm_set_cr0()directly to make surekvm_mmu_reset_context()is called to reset the mmu to nonpaging mode.Signed-off-by Eduardo Habkost <[email protected]>
Should this go into -stable?
Alex
Re: [PATCH 2/3] kvm: svm: reset cr0 properly on vcpu reset
Quoted 13 lines · Alexander Graf
Quoted 12 lines · Eduardo Habkost
svm_vcpu_reset()was not properly resetting the contents of the guest-visible cr0 register, causing the following issue:
https://bugzilla.redhat.com/show_bug.cgi?id=525699Without resetting cr0 properly, the vcpu was running the SIPI bootstrap routine with paging enabled, making the vcpu get a pagefault exception while trying to run it.
Instead of setting
vmcb->save.cr0directly, the new code just resetskvm->arch.cr0and callskvm_set_cr0(). The bits that were set/cleared onvmcb->save.cr0(PG, WP, !CD, !NW) will be set properly bysvm_set_cr0().
Quoted 7 lines
Quoted 5 lines
kvm_set_cr0()is used instead of callingsvm_set_cr0()directly to make surekvm_mmu_reset_context()is called to reset the mmu to nonpaging mode.Signed-off-by Eduardo Habkost <[email protected]>Should this go into -stable?
I think so. The patch is from October, was -stable branched before that?
Signature · 1 line
Eduardo
Re: [PATCH 2/3] kvm: svm: reset cr0 properly on vcpu reset
Quoted 17 lines · Eduardo Habkost
Quoted 16 lines · Alexander Graf
Quoted 15 lines · Eduardo Habkost
svm_vcpu_reset()was not properly resetting the contents of the guest-visible cr0 register, causing the following issue:
https://bugzilla.redhat.com/show_bug.cgi?id=525699Without resetting cr0 properly, the vcpu was running the SIPI bootstrap routine with paging enabled, making the vcpu get a pagefault exception while trying to run it.
Instead of setting
vmcb->save.cr0directly, the new code just resetskvm->arch.cr0and callskvm_set_cr0(). The bits that were set/cleared onvmcb->save.cr0(PG, WP, !CD, !NW) will be set properly bysvm_set_cr0().
kvm_set_cr0()is used instead of callingsvm_set_cr0()directly to make surekvm_mmu_reset_context()is called to reset the mmu to nonpaging mode.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Eduardo Habkost <[email protected]>Should this go into -stable?
I think so. The patch is from October, was -stable branched before that?
If I read the diff log correctly 2.6.32 kvm development was branched off end of July 2009. The important question is if this patch fixes a regression introduced by some speedup magic.
Alex
Re: [PATCH 2/3] kvm: svm: reset cr0 properly on vcpu reset
Quoted 23 lines · Alexander Graf
Quoted 20 lines · Eduardo Habkost
Quoted 19 lines · Alexander Graf
Quoted 17 lines · Eduardo Habkost
svm_vcpu_reset()was not properly resetting the contents of the guest-visible cr0 register, causing the following issue:
https://bugzilla.redhat.com/show_bug.cgi?id=525699Without resetting cr0 properly, the vcpu was running the SIPI bootstrap routine with paging enabled, making the vcpu get a pagefault exception while trying to run it.
Instead of setting
vmcb->save.cr0directly, the new code just resetskvm->arch.cr0and callskvm_set_cr0(). The bits that were set/cleared onvmcb->save.cr0(PG, WP, !CD, !NW) will be set properly bysvm_set_cr0().
kvm_set_cr0()is used instead of callingsvm_set_cr0()directly to make surekvm_mmu_reset_context()is called to reset the mmu to nonpaging mode.Signed-off-by Eduardo Habkost <[email protected]>
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Should this go into -stable?
I think so. The patch is from October, was -stable branched before that?
If I read the diff log correctly 2.6.32 kvm development was branched off end of July 2009. The important question is if this patch fixes a regression introduced by some speedup magic.
I have just checked git history, and it looks like this is not a regression. Before this patch, vcpu->cr0 (the guest-visible cr0 value) was never reset on vcpu reset, but only vcpu->svm->vmcb->save.cr0 (the actual cr0 value used by the CPU).
Signature · 1 line
Eduardo
Re: [PATCH 2/3] kvm: svm: reset cr0 properly on vcpu reset
Quoted 36 lines · Eduardo Habkost
Quoted 25 lines · Alexander Graf
Quoted 22 lines · Eduardo Habkost
Quoted 20 lines · Alexander Graf
Quoted 18 lines · Eduardo Habkost
svm_vcpu_reset()was not properly resetting the contents of the guest-visible cr0 register, causing the following issue:
https://bugzilla.redhat.com/show_bug.cgi?id=525699Without resetting cr0 properly, the vcpu was running the SIPI bootstrap routine with paging enabled, making the vcpu get a pagefault exception while trying to run it.
Instead of setting
vmcb->save.cr0directly, the new code just resetskvm->arch.cr0and callskvm_set_cr0(). The bits that were set/cleared onvmcb->save.cr0(PG, WP, !CD, !NW) will be set properly bysvm_set_cr0().
kvm_set_cr0()is used instead of callingsvm_set_cr0()directly to make surekvm_mmu_reset_context()is called to reset the mmu to nonpaging mode.Signed-off-by Eduardo Habkost <[email protected]>Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Should this go into -stable?
I think so. The patch is from October, was -stable branched before that?
If I read the diff log correctly 2.6.32 kvm development was branched off end of July 2009. The important question is if this patch fixes a regression introduced by some speedup magic.
Quoted 5 lines
I have just checked git history, and it looks like this is not a regression. Before this patch,
vcpu->cr0(the guest-visible cr0 value) was never reset on vcpu reset, but onlyvcpu->svm->vmcb->save.cr0(the actual cr0 value used by the CPU).
Good to know. Thanks for looking into this!
Alex
PATCH 3/3 kvm: svm: init_vmcb(): remove redundant save->cr0 initialization
In reply to Eduardo HabkostThe svm_set_cr0() call will initialize save->cr0 properly even when npt is enabled, clearing the NW and CD bits as expected, so we don't need to initialize it manually for npt_enabled anymore.
--- arch/x86/kvm/svm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
arch/x86/kvm/svm.c +0 -2
@@ -646,8 +646,6 @@ static void init_vmcb(struct vcpu_svm *svm) control->intercept_cr_write &= ~(INTERCEPT_CR0_MASK |INTERCEPT_CR3_MASK ); save->g_pat =0x0007040600070406ULL ; -/* enable caching because the QEMU Bios doesn't enable it */ - save->cr0 =X86_CR0_ET ; save->cr3 =0 ; save->cr4 =0 ; }
Signature · 1 line
1.6.3.rc4.29.g8146
Avi Kivity
AppliedQuoted 7 lines · Eduardo Habkost
Hi,
The following patches fix a bug on the SIPI reset code for SVM. cr0 was not being reset properly, making KVM keep the vcpu on paging mode, thus not being able to run the real-mode boostrap code. This bug was reported at:
https://bugzilla.redhat.com/show_bug.cgi?id=525699
Quoted 7 lines
The first patch is cosmetic, and it just changes the vmx code to use the same macros when initializing cr0, instead of a hardcoded hex value.
The patches were tested by running a RHEL-5.4 guest and and triggering the SIPI reset by offlining and onlining cpus on the guest. They were tested on both NPT-enabled and NPT-disabled cases.
Applied, thanks.
Signature · 1 line
error compiling committee.c: too many arguments to function