summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2012-08-28 17:43:26 -0300
committerAvi Kivity <avi@redhat.com>2012-09-06 16:37:30 +0300
commit3b4dc3a031110753b9ba36432dbd21f989fcee56 (patch)
tree919feea527d3c3708db62a1e6bf33846adfd787d
parent12d6e7538e2d418c08f082b1b44ffa5fb7270ed8 (diff)
downloadop-kernel-dev-3b4dc3a031110753b9ba36432dbd21f989fcee56.zip
op-kernel-dev-3b4dc3a031110753b9ba36432dbd21f989fcee56.tar.gz
KVM: move postcommit flush to x86, as mmio sptes are x86 specific
Other arches do not need this. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> v2: fix incorrect deletion of mmio sptes on gpa move (noticed by Takuya) Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/x86/kvm/x86.c8
-rw-r--r--virt/kvm/kvm_main.c7
2 files changed, 8 insertions, 7 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 37797a0..6f6812e 100644
--- a/arch/x86/kvm/x86.c
+++ b/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/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index f41ea12..4fe02d90 100644
--- a/virt/kvm/kvm_main.c
+++ b/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);
OpenPOWER on IntegriCloud