diff options
| author | Paul Mackerras <paulus@samba.org> | 2013-12-16 13:31:46 +1100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-12-18 11:30:35 +0100 |
| commit | df9059bb64023da9f27e56a94a3e2b8f4b6336a9 (patch) | |
| tree | b07b0977b2ae94db5a5f898f79bbebf2171b79db | |
| parent | 36e7bb38028d3d812aa7749208249d600a30c22c (diff) | |
| download | op-kernel-dev-df9059bb64023da9f27e56a94a3e2b8f4b6336a9.zip op-kernel-dev-df9059bb64023da9f27e56a94a3e2b8f4b6336a9.tar.gz | |
KVM: PPC: Book3S HV: Don't drop low-order page address bits
Commit caaa4c804fae ("KVM: PPC: Book3S HV: Fix physical address
calculations") unfortunately resulted in some low-order address bits
getting dropped in the case where the guest is creating a 4k HPTE
and the host page size is 64k. By getting the low-order bits from
hva rather than gpa we miss out on bits 12 - 15 in this case, since
hva is at page granularity. This puts the missing bits back in.
Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rm_mmu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c index 1931aa3..8689e2e 100644 --- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c +++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c @@ -240,6 +240,7 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags, is_io = hpte_cache_bits(pte_val(pte)); pa = pte_pfn(pte) << PAGE_SHIFT; pa |= hva & (pte_size - 1); + pa |= gpa & ~PAGE_MASK; } } |
