Commit 70cd4c10 authored by Paul Mackerras's avatar Paul Mackerras

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: 9e04ba69 ("KVM: PPC: Book3S HV: Add basic infrastructure for radix guests")
Fixes: e9983344 ("powerpc/mm/radix: Add partition table format & callback")
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent fd7e9a88
...@@ -46,7 +46,7 @@ extern struct patb_entry *partition_tb; ...@@ -46,7 +46,7 @@ extern struct patb_entry *partition_tb;
/* Bits in patb0 field */ /* Bits in patb0 field */
#define PATB_HR (1UL << 63) #define PATB_HR (1UL << 63)
#define RPDB_MASK 0x0ffffffffffff00fUL #define RPDB_MASK 0x0fffffffffffff00UL
#define RPDB_SHIFT (1UL << 8) #define RPDB_SHIFT (1UL << 8)
#define RTS1_SHIFT 61 /* top 2 bits of radix tree size */ #define RTS1_SHIFT 61 /* top 2 bits of radix tree size */
#define RTS1_MASK (3UL << RTS1_SHIFT) #define RTS1_MASK (3UL << RTS1_SHIFT)
...@@ -57,6 +57,7 @@ extern struct patb_entry *partition_tb; ...@@ -57,6 +57,7 @@ extern struct patb_entry *partition_tb;
/* Bits in patb1 field */ /* Bits in patb1 field */
#define PATB_GR (1UL << 63) /* guest uses radix; must match HR */ #define PATB_GR (1UL << 63) /* guest uses radix; must match HR */
#define PRTS_MASK 0x1f /* process table size field */ #define PRTS_MASK 0x1f /* process table size field */
#define PRTB_MASK 0x0ffffffffffff000UL
/* /*
* Limit process table to PAGE_SIZE table. This * Limit process table to PAGE_SIZE table. This
......
...@@ -32,6 +32,7 @@ int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, ...@@ -32,6 +32,7 @@ int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
u32 pid; u32 pid;
int ret, level, ps; int ret, level, ps;
__be64 prte, rpte; __be64 prte, rpte;
unsigned long ptbl;
unsigned long root, pte, index; unsigned long root, pte, index;
unsigned long rts, bits, offset; unsigned long rts, bits, offset;
unsigned long gpa; unsigned long gpa;
...@@ -53,8 +54,8 @@ int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, ...@@ -53,8 +54,8 @@ int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
return -EINVAL; return -EINVAL;
/* Read partition table to find root of tree for effective PID */ /* Read partition table to find root of tree for effective PID */
ret = kvm_read_guest(kvm, kvm->arch.process_table + pid * 16, ptbl = (kvm->arch.process_table & PRTB_MASK) + (pid * 16);
&prte, sizeof(prte)); ret = kvm_read_guest(kvm, ptbl, &prte, sizeof(prte));
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment