mirror of
https://github.com/torvalds/linux
synced 2024-10-20 18:28:21 +00:00
caaa4c804f
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: Paul Mackerras <paulus@samba.org> Signed-off-by: Alexander Graf <agraf@suse.de> |
||
|---|---|---|
| .. | ||
| 44x.c | ||
| 44x_emulate.c | ||
| 44x_tlb.c | ||
| 44x_tlb.h | ||
| book3s.c | ||
| book3s.h | ||
| book3s_32_mmu.c | ||
| book3s_32_mmu_host.c | ||
| book3s_32_sr.S | ||
| book3s_64_mmu.c | ||
| book3s_64_mmu_host.c | ||
| book3s_64_mmu_hv.c | ||
| book3s_64_slb.S | ||
| book3s_64_vio.c | ||
| book3s_64_vio_hv.c | ||
| book3s_emulate.c | ||
| book3s_exports.c | ||
| book3s_hv.c | ||
| book3s_hv_builtin.c | ||
| book3s_hv_cma.c | ||
| book3s_hv_cma.h | ||
| book3s_hv_interrupts.S | ||
| book3s_hv_ras.c | ||
| book3s_hv_rm_mmu.c | ||
| book3s_hv_rm_xics.c | ||
| book3s_hv_rmhandlers.S | ||
| book3s_interrupts.S | ||
| book3s_mmu_hpte.c | ||
| book3s_paired_singles.c | ||
| book3s_pr.c | ||
| book3s_pr_papr.c | ||
| book3s_rmhandlers.S | ||
| book3s_rtas.c | ||
| book3s_segment.S | ||
| book3s_xics.c | ||
| book3s_xics.h | ||
| booke.c | ||
| booke.h | ||
| booke_emulate.c | ||
| booke_interrupts.S | ||
| bookehv_interrupts.S | ||
| e500.c | ||
| e500.h | ||
| e500_emulate.c | ||
| e500_mmu.c | ||
| e500_mmu_host.c | ||
| e500_mmu_host.h | ||
| e500mc.c | ||
| emulate.c | ||
| fpu.S | ||
| irq.h | ||
| Kconfig | ||
| Makefile | ||
| mpic.c | ||
| powerpc.c | ||
| timing.c | ||
| timing.h | ||
| trace.h | ||
| trace_booke.h | ||
| trace_pr.h | ||