KVM: PPC: Book3S: Trim top 4 bits of physical address in RTAS code

The in-kernel emulation of RTAS functions needs to read the argument
buffer from guest memory in order to find out what function is being
requested.  The guest supplies the guest physical address of the buffer,
and on a real system the code that reads that buffer would run in guest
real mode.  In guest real mode, the processor ignores the top 4 bits
of the address specified in load and store instructions.  In order to
emulate that behaviour correctly, we need to mask off those bits
before calling kvm_read_guest() or kvm_write_guest().  This adds that
masking.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Acked-by: Scott Wood <scottwood@freescale.com>

diff --git a/arch/powerpc/kvm/book3s_rtas.c b/arch/powerpc/kvm/book3s_rtas.c
index cf95cdef73c993f9b7e78aea998f275097ab0a60..7a053157483b64f9dfbc3a6216d486cc50d628fa 100644 (file)
--- a/arch/powerpc/kvm/book3s_rtas.c
+++ b/arch/powerpc/kvm/book3s_rtas.c
@@ -213,8 +213,11 @@ int kvmppc_rtas_hcall(struct kvm_vcpu *vcpu)
        gpa_t args_phys;
        int rc;
 
-       /* r4 contains the guest physical address of the RTAS args */
-       args_phys = kvmppc_get_gpr(vcpu, 4);
+       /*
+        * r4 contains the guest physical address of the RTAS args
+        * Mask off the top 4 bits since this is a guest real address
+        */
+       args_phys = kvmppc_get_gpr(vcpu, 4) & KVM_PAM;
 
        rc = kvm_read_guest(vcpu->kvm, args_phys, &args, sizeof(args));
        if (rc)