KVM: PPC: Book3S HV: Fix software walk of guest process page tables

This fixes some bugs in the code that walks the guest's page tables.
These bugs cause MMIO emulation to fail whenever the guest is in
virtial mode (MMU on), leading to the guest hanging if it tried to
access a virtio device.

The first bug was that when reading the guest's process table, we were
using the whole of arch->process_table, not just the field that contains
the process table base address.  The second bug was that the mask used
when reading the process table entry to get the radix tree base address,
RPDB_MASK, had the wrong value.

Fixes: 9e04ba69beec ("KVM: PPC: Book3S HV: Add basic infrastructure for radix guests")
Fixes: e99833448c5f ("powerpc/mm/radix: Add partition table format & callback")
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h
index d73e9dfa5237f4e11d63810c5439ab93b1b4f645..440f3423e213778fcaaba47d8d2703048d4718d0 100644 (file)
--- a/arch/powerpc/include/asm/book3s/64/mmu.h
+++ b/arch/powerpc/include/asm/book3s/64/mmu.h
@@ -46,7 +46,7 @@ extern struct patb_entry *partition_tb;
 
 /* Bits in patb0 field */
 #define PATB_HR                (1UL << 63)
-#define RPDB_MASK      0x0ffffffffffff00fUL
+#define RPDB_MASK      0x0fffffffffffff00UL
 #define RPDB_SHIFT     (1UL << 8)
 #define RTS1_SHIFT     61              /* top 2 bits of radix tree size */
 #define RTS1_MASK      (3UL << RTS1_SHIFT)
@@ -57,6 +57,7 @@ extern struct patb_entry *partition_tb;
 /* Bits in patb1 field */
 #define PATB_GR                (1UL << 63)     /* guest uses radix; must match HR */
 #define PRTS_MASK      0x1f            /* process table size field */
+#define PRTB_MASK      0x0ffffffffffff000UL
 
 /*
  * Limit process table to PAGE_SIZE table. This

diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c
index 4344651f408ca24a4149eb042268ec502363c7a4..f6b3e67c576294f96cbb5a5e5178f09563307c1b 100644 (file)
--- a/arch/powerpc/kvm/book3s_64_mmu_radix.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c
@@ -32,6 +32,7 @@ int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
        u32 pid;
        int ret, level, ps;
        __be64 prte, rpte;
+       unsigned long ptbl;
        unsigned long root, pte, index;
        unsigned long rts, bits, offset;
        unsigned long gpa;
@@ -53,8 +54,8 @@ int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
                return -EINVAL;
 
        /* Read partition table to find root of tree for effective PID */
-       ret = kvm_read_guest(kvm, kvm->arch.process_table + pid * 16,
-                            &prte, sizeof(prte));
+       ptbl = (kvm->arch.process_table & PRTB_MASK) + (pid * 16);
+       ret = kvm_read_guest(kvm, ptbl, &prte, sizeof(prte));
        if (ret)
                return ret;