Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fix from Paolo Bonzini:
"A simple patch for a pretty bad bug: Unbreak AMD nested
virtualization."
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: nSVM: fix switch to guest mmu
+3
-1
+3
-1
arch/x86/kvm/svm.c
+3
-1
arch/x86/kvm/svm.c
···
2937
2937
static void nested_svm_init_mmu_context(struct kvm_vcpu *vcpu)
2938
2938
{
2939
2939
WARN_ON(mmu_is_nested(vcpu));
2940
+
2941
+
vcpu->arch.mmu = &vcpu->arch.guest_mmu;
2940
2942
kvm_init_shadow_mmu(vcpu);
2941
2943
vcpu->arch.mmu->set_cr3 = nested_svm_set_tdp_cr3;
2942
2944
vcpu->arch.mmu->get_cr3 = nested_svm_get_tdp_cr3;
···
2951
2949
2952
2950
static void nested_svm_uninit_mmu_context(struct kvm_vcpu *vcpu)
2953
2951
{
2952
+
vcpu->arch.mmu = &vcpu->arch.root_mmu;
2954
2953
vcpu->arch.walk_mmu = &vcpu->arch.root_mmu;
2955
2954
}
2956
2955
···
3461
3458
svm->vcpu.arch.hflags &= ~HF_HIF_MASK;
3462
3459
3463
3460
if (nested_vmcb->control.nested_ctl & SVM_NESTED_CTL_NP_ENABLE) {
3464
-
kvm_mmu_unload(&svm->vcpu);
3465
3461
svm->nested.nested_cr3 = nested_vmcb->control.nested_cr3;
3466
3462
nested_svm_init_mmu_context(&svm->vcpu);
3467
3463
}