diff options
author | Eddie Dong <eddie.dong@intel.com> | 2007-10-10 02:26:45 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2007-10-22 06:03:28 -0400 |
commit | 8668a3c468ed55d19514117a5a959d91d3d03823 (patch) | |
tree | 3744b15b77dfdc6457225d69ee76d255b62ff94e /drivers/kvm | |
parent | 1b6269db3f83396c2fd2c8d0f3e0f37ac0e6ba05 (diff) |
KVM: VMX: Reset mmu context when entering real mode
Resetting an SMP guest will force AP enter real mode (RESET) with
paging enabled in protected mode. While current enter_rmode() can
only handle mode switch from nonpaging mode to real mode which leads
to SMP reboot failure.
Fix by reloading the mmu context on entering real mode.
Signed-off-by: Yaozu (Eddie) Dong <eddie.dong@intel.com>
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm')
-rw-r--r-- | drivers/kvm/mmu.c | 1 | ||||
-rw-r--r-- | drivers/kvm/vmx.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c index 71716182d59d..feb5ac986c5d 100644 --- a/drivers/kvm/mmu.c +++ b/drivers/kvm/mmu.c | |||
@@ -1049,6 +1049,7 @@ int kvm_mmu_reset_context(struct kvm_vcpu *vcpu) | |||
1049 | destroy_kvm_mmu(vcpu); | 1049 | destroy_kvm_mmu(vcpu); |
1050 | return init_kvm_mmu(vcpu); | 1050 | return init_kvm_mmu(vcpu); |
1051 | } | 1051 | } |
1052 | EXPORT_SYMBOL_GPL(kvm_mmu_reset_context); | ||
1052 | 1053 | ||
1053 | int kvm_mmu_load(struct kvm_vcpu *vcpu) | 1054 | int kvm_mmu_load(struct kvm_vcpu *vcpu) |
1054 | { | 1055 | { |
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index bcc1e398a976..f130c01422cf 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c | |||
@@ -1128,6 +1128,7 @@ static void enter_rmode(struct kvm_vcpu *vcpu) | |||
1128 | fix_rmode_seg(VCPU_SREG_GS, &vcpu->rmode.gs); | 1128 | fix_rmode_seg(VCPU_SREG_GS, &vcpu->rmode.gs); |
1129 | fix_rmode_seg(VCPU_SREG_FS, &vcpu->rmode.fs); | 1129 | fix_rmode_seg(VCPU_SREG_FS, &vcpu->rmode.fs); |
1130 | 1130 | ||
1131 | kvm_mmu_reset_context(vcpu); | ||
1131 | init_rmode_tss(vcpu->kvm); | 1132 | init_rmode_tss(vcpu->kvm); |
1132 | } | 1133 | } |
1133 | 1134 | ||