diff options
author | Cédric Le Goater <clg@fr.ibm.com> | 2014-11-21 00:45:59 +0100 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2014-12-15 13:27:24 +0100 |
commit | ffada016fb22fbbb9849d3cc5ec72ca8f0377681 (patch) | |
tree | 2c66e15af4714d827103f9ca95aef1657526b11e | |
parent | 5b88cda665bc6ae92c9bd12060c9fd0840211eb7 (diff) | |
download | linux-stable-ffada016fb22fbbb9849d3cc5ec72ca8f0377681.tar.gz linux-stable-ffada016fb22fbbb9849d3cc5ec72ca8f0377681.tar.bz2 linux-stable-ffada016fb22fbbb9849d3cc5ec72ca8f0377681.zip |
KVM: PPC: Book3S HV: ptes are big endian
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>
-rw-r--r-- | arch/powerpc/kvm/book3s_64_mmu_hv.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index 41f96c51dfca..59425f143c6d 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -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; |