From ffcfb536e9470175f9a0071e5d249464520185a6 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Tue, 28 Aug 2012 17:43:26 -0300 Subject: [PATCH] --- yaml --- r: 329901 b: refs/heads/master c: 3b4dc3a031110753b9ba36432dbd21f989fcee56 h: refs/heads/master i: 329899: c40ec2eb46087866a3e18f40dca2491213534e67 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/x86.c | 8 ++++++++ trunk/virt/kvm/kvm_main.c | 7 ------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ce4ac666f130..2eeedb61eaf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12d6e7538e2d418c08f082b1b44ffa5fb7270ed8 +refs/heads/master: 3b4dc3a031110753b9ba36432dbd21f989fcee56 diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c index 37797a090a8f..6f6812ec8419 100644 --- a/trunk/arch/x86/kvm/x86.c +++ b/trunk/arch/x86/kvm/x86.c @@ -6445,6 +6445,14 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, kvm_mmu_change_mmu_pages(kvm, nr_mmu_pages); kvm_mmu_slot_remove_write_access(kvm, mem->slot); spin_unlock(&kvm->mmu_lock); + /* + * If memory slot is created, or moved, we need to clear all + * mmio sptes. + */ + if (npages && old.base_gfn != mem->guest_phys_addr >> PAGE_SHIFT) { + kvm_mmu_zap_all(kvm); + kvm_reload_remote_mmus(kvm); + } } void kvm_arch_flush_shadow_all(struct kvm *kvm) diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c index f41ea1262d51..4fe02d900810 100644 --- a/trunk/virt/kvm/kvm_main.c +++ b/trunk/virt/kvm/kvm_main.c @@ -849,13 +849,6 @@ int __kvm_set_memory_region(struct kvm *kvm, kvm_arch_commit_memory_region(kvm, mem, old, user_alloc); - /* - * If the new memory slot is created, we need to clear all - * mmio sptes. - */ - if (npages && old.base_gfn != mem->guest_phys_addr >> PAGE_SHIFT) - kvm_arch_flush_shadow_all(kvm); - kvm_free_physmem_slot(&old, &new); kfree(old_memslots);