diff options
| author | Paul Mackerras | 2013-09-20 06:52:45 +0200 |
|---|---|---|
| committer | Alexander Graf | 2013-10-17 14:45:03 +0200 |
| commit | c9029c341da646ab0c9911ea4c118eaa0a2eb0fa (patch) | |
| tree | b2474961ed358c115d3dbd4dc9a29791b67e1a75 /arch/powerpc/kvm/book3s_pr.c | |
| parent | KVM: PPC: Book3S PR: Allow guest to use 64k pages (diff) | |
| download | kernel-qcow2-linux-c9029c341da646ab0c9911ea4c118eaa0a2eb0fa.tar.gz kernel-qcow2-linux-c9029c341da646ab0c9911ea4c118eaa0a2eb0fa.tar.xz kernel-qcow2-linux-c9029c341da646ab0c9911ea4c118eaa0a2eb0fa.zip | |
KVM: PPC: Book3S PR: Use 64k host pages where possible
Currently, PR KVM uses 4k pages for the host-side mappings of guest
memory, regardless of the host page size. When the host page size is
64kB, we might as well use 64k host page mappings for guest mappings
of 64kB and larger pages and for guest real-mode mappings. However,
the magic page has to remain a 4k page.
To implement this, we first add another flag bit to the guest VSID
values we use, to indicate that this segment is one where host pages
should be mapped using 64k pages. For segments with this bit set
we set the bits in the shadow SLB entry to indicate a 64k base page
size. When faulting in host HPTEs for this segment, we make them
64k HPTEs instead of 4k. We record the pagesize in struct hpte_cache
for use when invalidating the HPTE.
For now we restrict the segment containing the magic page (if any) to
4k pages. It should be possible to lift this restriction in future
by ensuring that the magic 4k page is appropriately positioned within
a host 64k page.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kvm/book3s_pr.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_pr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 6cc99583ed39..e9e8c748e673 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -422,6 +422,7 @@ int kvmppc_handle_pagefault(struct kvm_run *run, struct kvm_vcpu *vcpu, pte.raddr = eaddr & KVM_PAM; pte.eaddr = eaddr; pte.vpage = eaddr >> 12; + pte.page_size = MMU_PAGE_64K; } switch (vcpu->arch.shared->msr & (MSR_DR|MSR_IR)) { |