Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df9059bb authored by Paul Mackerras's avatar Paul Mackerras Committed by Alexander Graf
Browse files

KVM: PPC: Book3S HV: Don't drop low-order page address bits 



Commit caaa4c80 ("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: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 36e7bb38

arch/powerpc/kvm/book3s_hv_rm_mmu.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

		}

	}