]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
KVM: PPC: Preload magic page when in kernel mode
authorAlexander Graf <agraf@suse.de>
Mon, 2 Aug 2010 14:08:22 +0000 (16:08 +0200)
committerAvi Kivity <avi@redhat.com>
Sun, 24 Oct 2010 08:52:05 +0000 (10:52 +0200)
When the guest jumps into kernel mode and has the magic page mapped, theres a
very high chance that it will also use it. So let's detect that scenario and
map the segment accordingly.

Signed-off-by: Alexander Graf <agraf@suse.de>
arch/powerpc/kvm/book3s.c

index 37db61d37041e922c663103c186d2fe44841ab50..54ca578239dbef22d811717ef726c290123ee0f4 100644 (file)
@@ -145,6 +145,16 @@ void kvmppc_set_msr(struct kvm_vcpu *vcpu, u64 msr)
                   (old_msr & (MSR_PR|MSR_IR|MSR_DR))) {
                kvmppc_mmu_flush_segments(vcpu);
                kvmppc_mmu_map_segment(vcpu, kvmppc_get_pc(vcpu));
+
+               /* Preload magic page segment when in kernel mode */
+               if (!(msr & MSR_PR) && vcpu->arch.magic_page_pa) {
+                       struct kvm_vcpu_arch *a = &vcpu->arch;
+
+                       if (msr & MSR_DR)
+                               kvmppc_mmu_map_segment(vcpu, a->magic_page_ea);
+                       else
+                               kvmppc_mmu_map_segment(vcpu, a->magic_page_pa);
+               }
        }
 
        /* Preload FPU if it's enabled */