From: Alexander Graf <agraf@suse.de>
To: kvm-ppc@vger.kernel.org
Cc: kvm@vger.kernel.org, anton@samba.org
Subject: [PATCH 04/13] KVM: PPC: Book3S_64 PR: Access HTAB in big endian
Date: Thu, 24 Apr 2014 13:12:31 +0000 [thread overview]
Message-ID: <1398345160-4830-5-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1398345160-4830-1-git-send-email-agraf@suse.de>
The HTAB is always big endian. We access the guest's HTAB using
copy_from/to_user, but don't yet take care of the fact that we might
be running on an LE host.
Wrap all accesses to the guest HTAB with big endian accessors.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
arch/powerpc/kvm/book3s_64_mmu.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c
index e9854e7..158fb22 100644
--- a/arch/powerpc/kvm/book3s_64_mmu.c
+++ b/arch/powerpc/kvm/book3s_64_mmu.c
@@ -281,12 +281,15 @@ do_second:
key = 4;
for (i=0; i<16; i+=2) {
+ u64 pte0 = be64_to_cpu(pteg[i]);
+ u64 pte1 = be64_to_cpu(pteg[i + 1]);
+
/* Check all relevant fields of 1st dword */
- if ((pteg[i] & v_mask) = v_val) {
+ if ((pte0 & v_mask) = v_val) {
/* If large page bit is set, check pgsize encoding */
if (slbe->large &&
(vcpu->arch.hflags & BOOK3S_HFLAG_MULTI_PGSIZE)) {
- pgsize = decode_pagesize(slbe, pteg[i+1]);
+ pgsize = decode_pagesize(slbe, pte1);
if (pgsize < 0)
continue;
}
@@ -303,8 +306,8 @@ do_second:
goto do_second;
}
- v = pteg[i];
- r = pteg[i+1];
+ v = be64_to_cpu(pteg[i]);
+ r = be64_to_cpu(pteg[i+1]);
pp = (r & HPTE_R_PP) | key;
if (r & HPTE_R_PP0)
pp |= 8;
--
1.8.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Graf <agraf@suse.de>
To: kvm-ppc@vger.kernel.org
Cc: kvm@vger.kernel.org, anton@samba.org
Subject: [PATCH 04/13] KVM: PPC: Book3S_64 PR: Access HTAB in big endian
Date: Thu, 24 Apr 2014 15:12:31 +0200 [thread overview]
Message-ID: <1398345160-4830-5-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1398345160-4830-1-git-send-email-agraf@suse.de>
The HTAB is always big endian. We access the guest's HTAB using
copy_from/to_user, but don't yet take care of the fact that we might
be running on an LE host.
Wrap all accesses to the guest HTAB with big endian accessors.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
arch/powerpc/kvm/book3s_64_mmu.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c
index e9854e7..158fb22 100644
--- a/arch/powerpc/kvm/book3s_64_mmu.c
+++ b/arch/powerpc/kvm/book3s_64_mmu.c
@@ -281,12 +281,15 @@ do_second:
key = 4;
for (i=0; i<16; i+=2) {
+ u64 pte0 = be64_to_cpu(pteg[i]);
+ u64 pte1 = be64_to_cpu(pteg[i + 1]);
+
/* Check all relevant fields of 1st dword */
- if ((pteg[i] & v_mask) == v_val) {
+ if ((pte0 & v_mask) == v_val) {
/* If large page bit is set, check pgsize encoding */
if (slbe->large &&
(vcpu->arch.hflags & BOOK3S_HFLAG_MULTI_PGSIZE)) {
- pgsize = decode_pagesize(slbe, pteg[i+1]);
+ pgsize = decode_pagesize(slbe, pte1);
if (pgsize < 0)
continue;
}
@@ -303,8 +306,8 @@ do_second:
goto do_second;
}
- v = pteg[i];
- r = pteg[i+1];
+ v = be64_to_cpu(pteg[i]);
+ r = be64_to_cpu(pteg[i+1]);
pp = (r & HPTE_R_PP) | key;
if (r & HPTE_R_PP0)
pp |= 8;
--
1.8.1.4
next prev parent reply other threads:[~2014-04-24 13:12 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 13:12 [PATCH 00/13] PPC: KVM: Enable PR KVM on ppc64le Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` [PATCH 01/13] KVM: PPC: Book3S PR: Implement LPCR ONE_REG Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` [PATCH 02/13] KVM: PPC: Book3S: PR: Fix C/R bit setting Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-05-10 7:11 ` Paul Mackerras
2014-05-10 7:11 ` Paul Mackerras
2014-04-24 13:12 ` [PATCH 03/13] KVM: PPC: Book3S_32: PR: Access HTAB in big endian Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` Alexander Graf [this message]
2014-04-24 13:12 ` [PATCH 04/13] KVM: PPC: Book3S_64 " Alexander Graf
2014-04-24 13:12 ` [PATCH 05/13] KVM: PPC: Book3S_64 PR: Access shadow slb " Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` [PATCH 06/13] KVM: PPC: Book3S PR: Give guest control over MSR_LE Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` [PATCH 07/13] KVM: PPC: Book3S PR: Default to big endian guest Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` [PATCH 08/13] KVM: PPC: Book3S PR: PAPR: Access HTAB in big endian Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` [PATCH 09/13] KVM: PPC: Book3S PR: PAPR: Access RTAS " Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` [PATCH 10/13] KVM: PPC: PR: Fill pvinfo hcall instructions " Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` [PATCH 11/13] KVM: PPC: Make shared struct aka magic page guest endian Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` [PATCH 12/13] KVM: PPC: Book3S PR: Do dcbz32 patching with big endian instructions Alexander Graf
2014-04-24 13:12 ` Alexander Graf
2014-04-24 13:12 ` [PATCH 13/13] KVM: PPC: Book3S: Move little endian conflict to HV KVM Alexander Graf
2014-04-24 13:12 ` Alexander Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398345160-4830-5-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=anton@samba.org \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.