• Paul Mackerras's avatar
    KVM: PPC: Book3S HV: Fix physical address calculations · caaa4c80
    Paul Mackerras authored
    This fixes a bug in kvmppc_do_h_enter() where the physical address
    for a page can be calculated incorrectly if transparent huge pages
    (THP) are active.  Until THP came along, it was true that if we
    encountered a large (16M) page in kvmppc_do_h_enter(), then the
    associated memslot must be 16M aligned for both its guest physical
    address and the userspace address, and the physical address
    calculations in kvmppc_do_h_enter() assumed that.  With THP, that
    is no longer true.
    
    In the case where we are using MMU notifiers and the page size that
    we get from the Linux page tables is larger than the page being mapped
    by the guest, we need to fill in some low-order bits of the physical
    address.  Without THP, these bits would be the same in the guest
    physical address (gpa) and the host virtual address (hva).  With THP,
    they can be different, and we need to use the bits from hva rather
    than gpa.
    
    In the case where we are not using MMU notifiers, the host physical
    address we get from the memslot->arch.slot_phys[] array already
    includes the low-order bits down to the PAGE_SIZE level, even if
    we are using large pages.  Thus we can simplify the calculation in
    this case to just add in the remaining bits in the case where
    PAGE_SIZE is 64k and the guest is mapping a 4k page.
    
    The same bug exists in kvmppc_book3s_hv_page_fault().  The basic fix
    is to use psize (the page size from the HPTE) rather than pte_size
    (the page size from the Linux PTE) when updating the HPTE low word
    in r.  That means that pfn needs to be computed to PAGE_SIZE
    granularity even if the Linux PTE is a huge page PTE.  That can be
    arranged simply by doing the page_to_pfn() before setting page to
    the head of the compound page.  If psize is less than PAGE_SIZE,
    then we need to make sure we only update the bits from PAGE_SIZE
    upwards, in order not to lose any sub-page offset bits in r.
    On the other hand, if psize is greater than PAGE_SIZE, we need to
    make sure we don't bring in non-zero low order bits in pfn, hence
    we mask (pfn << PAGE_SHIFT) with ~(psize - 1).
    Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
    Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
    caaa4c80
book3s_64_mmu_hv.c 41.2 KB