diff options
| author | Paul Mackerras <paulus@samba.org> | 2011-12-12 12:31:41 +0000 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-03-05 14:52:37 +0200 |
| commit | da9d1d7f2875cc8c1ffbce8f3501d0b33f4e7a4d (patch) | |
| tree | a811ee19778715766e720646506311c8fc7d7bd0 /arch/powerpc/kvm/book3s_hv_rm_mmu.c | |
| parent | c77162dee7aff6ab5f075da9b60f649cbbeb86cc (diff) | |
| download | kernel_replicant_linux-da9d1d7f2875cc8c1ffbce8f3501d0b33f4e7a4d.tar.gz kernel_replicant_linux-da9d1d7f2875cc8c1ffbce8f3501d0b33f4e7a4d.tar.bz2 kernel_replicant_linux-da9d1d7f2875cc8c1ffbce8f3501d0b33f4e7a4d.zip | |
KVM: PPC: Allow use of small pages to back Book3S HV guests
This relaxes the requirement that the guest memory be provided as
16MB huge pages, allowing it to be provided as normal memory, i.e.
in pages of PAGE_SIZE bytes (4k or 64k). To allow this, we index
the kvm->arch.slot_phys[] arrays with a small page index, even if
huge pages are being used, and use the low-order 5 bits of each
entry to store the order of the enclosing page with respect to
normal pages, i.e. log_2(enclosing_page_size / PAGE_SIZE).
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_rm_mmu.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c index 047c5e1fd70f..c086eb0fa992 100644 --- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c +++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c @@ -77,6 +77,10 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags, memslot = builtin_gfn_to_memslot(kvm, gfn); if (!(memslot && !(memslot->flags & KVM_MEMSLOT_INVALID))) return H_PARAMETER; + + /* Check if the requested page fits entirely in the memslot. */ + if (!slot_is_aligned(memslot, psize)) + return H_PARAMETER; slot_fn = gfn - memslot->base_gfn; physp = kvm->arch.slot_phys[memslot->id]; @@ -88,9 +92,9 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags, pa = *physp; if (!pa) return H_TOO_HARD; + pte_size = PAGE_SIZE << (pa & KVMPPC_PAGE_ORDER_MASK); pa &= PAGE_MASK; - pte_size = kvm->arch.ram_psize; if (pte_size < psize) return H_PARAMETER; if (pa && pte_size > psize) |