KVM: PPC: Book3S HV: ptes are big endian
authorCédric Le Goater <clg@fr.ibm.com>
Thu, 20 Nov 2014 23:45:59 +0000 (00:45 +0100)
committerAlexander Graf <agraf@suse.de>
Mon, 15 Dec 2014 12:27:24 +0000 (13:27 +0100)
When being restored from qemu, the kvm_get_htab_header are in native
endian, but the ptes are big endian.

This patch fixes restore on a KVM LE host. Qemu also needs a fix for
this :

     http://lists.nongnu.org/archive/html/qemu-ppc/2014-11/msg00008.html

Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
arch/powerpc/kvm/book3s_64_mmu_hv.c

index 41f96c51dfca0e36282e913b5647f73c3693cefc..59425f143c6d13ee8f72bdbdd8e47571d186653a 100644 (file)
@@ -1542,9 +1542,15 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,
                hptp = (__be64 *)(kvm->arch.hpt_virt + (i * HPTE_SIZE));
                lbuf = (unsigned long __user *)buf;
                for (j = 0; j < hdr.n_valid; ++j) {
+                       __be64 hpte_v;
+                       __be64 hpte_r;
+
                        err = -EFAULT;
-                       if (__get_user(v, lbuf) || __get_user(r, lbuf + 1))
+                       if (__get_user(hpte_v, lbuf) ||
+                           __get_user(hpte_r, lbuf + 1))
                                goto out;
+                       v = be64_to_cpu(hpte_v);
+                       r = be64_to_cpu(hpte_r);
                        err = -EINVAL;
                        if (!(v & HPTE_V_VALID))
                                goto out;