KVM: PPC: Book3S HV: Align gfn to L1 page size when inserting nest-rmap entry

Nested rmap entries are used to store the translation from L1 gpa to L2
gpa when entries are inserted into the shadow (nested) page tables. This
rmap list is located by indexing the rmap array in the memslot by L1
gfn. When we come to search for these entries we only know the L1 page size
(which could be PAGE_SIZE, 2M or a 1G page) and so can only select a gfn
aligned to that size. This means that when we insert the entry, so we can
find it later, we need to align the gfn we use to select the rmap list
in which to insert the entry to L1 page size as well.

By not doing this we were missing nested rmap entries when modifying L1
ptes which were for a page also passed through to an L2 guest.

Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c
index 606c392e5b1250a1df16c489dce5b455d41ee907..6a25a2e1901889864501c06460951d4b8d215cb1 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_nested.c
+++ b/arch/powerpc/kvm/book3s_hv_nested.c
@@ -1328,6 +1328,8 @@ static long int __kvmhv_nested_page_fault(struct kvm_run *run,
                        return ret;
                shift = kvmppc_radix_level_to_shift(level);
        }
+       /* Align gfn to the start of the page */
+       gfn = (gpa & ~((1UL << shift) - 1)) >> PAGE_SHIFT;
 
        /* 3. Compute the pte we need to insert for nest_gpa -> host r_addr */