KVM: PPC: Book3S: MMIO emulation support for little endian guests

MMIO emulation reads the last instruction executed by the guest
and then emulates. If the guest is running in Little Endian order,
or more generally in a different endian order of the host, the
instruction needs to be byte-swapped before being emulated.

This patch adds a helper routine which tests the endian order of
the host and the guest in order to decide whether a byteswap is
needed or not. It is then used to byteswap the last instruction
of the guest in the endian order of the host before MMIO emulation
is performed.

Finally, kvmppc_handle_load() of kvmppc_handle_store() are modified
to reverse the endianness of the MMIO if required.

Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
[agraf: add booke handling]
Signed-off-by: Alexander Graf <agraf@suse.de>

1 files changed, 24 insertions, 4 deletions

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 7ca9e0a80499..026dfaaa4772 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -673,9 +673,19 @@ static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu,
 }
 
 int kvmppc_handle_load(struct kvm_run *run, struct kvm_vcpu *vcpu,
-                       unsigned int rt, unsigned int bytes, int is_bigendian)
+                       unsigned int rt, unsigned int bytes,
+                       int is_default_endian)
 {
         int idx, ret;
+        int is_bigendian;
+
+        if (kvmppc_need_byteswap(vcpu)) {
+                /* Default endianness is "little endian". */
+                is_bigendian = !is_default_endian;
+        } else {
+                /* Default endianness is "big endian". */
+                is_bigendian = is_default_endian;
+        }
 
         if (bytes > sizeof(run->mmio.data)) {
                 printk(KERN_ERR "%s: bad MMIO length: %d\n", __func__,
@@ -711,21 +721,31 @@ EXPORT_SYMBOL_GPL(kvmppc_handle_load);
 
 /* Same as above, but sign extends */
 int kvmppc_handle_loads(struct kvm_run *run, struct kvm_vcpu *vcpu,
-                        unsigned int rt, unsigned int bytes, int is_bigendian)
+                        unsigned int rt, unsigned int bytes,
+                        int is_default_endian)
 {
         int r;
 
         vcpu->arch.mmio_sign_extend = 1;
-        r = kvmppc_handle_load(run, vcpu, rt, bytes, is_bigendian);
+        r = kvmppc_handle_load(run, vcpu, rt, bytes, is_default_endian);
 
         return r;
 }
 
 int kvmppc_handle_store(struct kvm_run *run, struct kvm_vcpu *vcpu,
-                        u64 val, unsigned int bytes, int is_bigendian)
+                        u64 val, unsigned int bytes, int is_default_endian)
 {
         void *data = run->mmio.data;
         int idx, ret;
+        int is_bigendian;
+
+        if (kvmppc_need_byteswap(vcpu)) {
+                /* Default endianness is "little endian". */
+                is_bigendian = !is_default_endian;
+        } else {
+                /* Default endianness is "big endian". */
+                is_bigendian = is_default_endian;
+        }
 
         if (bytes > sizeof(run->mmio.data)) {
                 printk(KERN_ERR "%s: bad MMIO length: %d\n", __func__,