All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Graf <agraf@suse.de>
To: kvm@vger.kernel.org
Cc: kvm-ppc@vger.kernel.org
Subject: [PATCH 04/14] KVM: PPC: Interpret SDR1 as HVA in PAPR mode
Date: Thu, 25 Aug 2011 16:39:43 +0200	[thread overview]
Message-ID: <1314283193-10323-5-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1314283193-10323-1-git-send-email-agraf@suse.de>

When running a PAPR guest, the guest is not allowed to set SDR1 - instead
the HTAB information is held in internal hypervisor structures. But all of
our current code relies on SDR1 and walking the HTAB like on real hardware.

So in order to not be too intrusive, we simply set SDR1 to the HTAB we hold
in host memory. That way we can keep the HTAB in user space, but use it from
kernel space to map the guest.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 arch/powerpc/kvm/book3s_64_mmu.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c
index c6d3e19..b871721 100644
--- a/arch/powerpc/kvm/book3s_64_mmu.c
+++ b/arch/powerpc/kvm/book3s_64_mmu.c
@@ -128,7 +128,13 @@ static hva_t kvmppc_mmu_book3s_64_get_pteg(
 	dprintk("MMU: page=0x%x sdr1=0x%llx pteg=0x%llx vsid=0x%llx\n",
 		page, vcpu_book3s->sdr1, pteg, slbe->vsid);
 
-	r = gfn_to_hva(vcpu_book3s->vcpu.kvm, pteg >> PAGE_SHIFT);
+	/* When running a PAPR guest, SDR1 contains a HVA address instead
+           of a GPA */
+	if (vcpu_book3s->vcpu.arch.papr_enabled)
+		r = pteg;
+	else
+		r = gfn_to_hva(vcpu_book3s->vcpu.kvm, pteg >> PAGE_SHIFT);
+
 	if (kvm_is_error_hva(r))
 		return r;
 	return r | (pteg & ~PAGE_MASK);
-- 
1.6.0.2


WARNING: multiple messages have this Message-ID (diff)
From: Alexander Graf <agraf@suse.de>
To: kvm@vger.kernel.org
Cc: kvm-ppc@vger.kernel.org
Subject: [PATCH 04/14] KVM: PPC: Interpret SDR1 as HVA in PAPR mode
Date: Thu, 25 Aug 2011 14:39:43 +0000	[thread overview]
Message-ID: <1314283193-10323-5-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1314283193-10323-1-git-send-email-agraf@suse.de>

When running a PAPR guest, the guest is not allowed to set SDR1 - instead
the HTAB information is held in internal hypervisor structures. But all of
our current code relies on SDR1 and walking the HTAB like on real hardware.

So in order to not be too intrusive, we simply set SDR1 to the HTAB we hold
in host memory. That way we can keep the HTAB in user space, but use it from
kernel space to map the guest.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 arch/powerpc/kvm/book3s_64_mmu.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c
index c6d3e19..b871721 100644
--- a/arch/powerpc/kvm/book3s_64_mmu.c
+++ b/arch/powerpc/kvm/book3s_64_mmu.c
@@ -128,7 +128,13 @@ static hva_t kvmppc_mmu_book3s_64_get_pteg(
 	dprintk("MMU: page=0x%x sdr1=0x%llx pteg=0x%llx vsid=0x%llx\n",
 		page, vcpu_book3s->sdr1, pteg, slbe->vsid);
 
-	r = gfn_to_hva(vcpu_book3s->vcpu.kvm, pteg >> PAGE_SHIFT);
+	/* When running a PAPR guest, SDR1 contains a HVA address instead
+           of a GPA */
+	if (vcpu_book3s->vcpu.arch.papr_enabled)
+		r = pteg;
+	else
+		r = gfn_to_hva(vcpu_book3s->vcpu.kvm, pteg >> PAGE_SHIFT);
+
 	if (kvm_is_error_hva(r))
 		return r;
 	return r | (pteg & ~PAGE_MASK);
-- 
1.6.0.2


  parent reply	other threads:[~2011-08-25 14:39 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-25 14:39 [PULL 00/14] ppc patch queue 2011-08-25 Alexander Graf
2011-08-25 14:39 ` Alexander Graf
2011-08-25 14:39 ` [PATCH 01/14] KVM: PPC: move compute_tlbie_rb to book3s common header Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` [PATCH 02/14] KVM: PPC: Add papr_enabled flag Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` [PATCH 03/14] KVM: PPC: Check privilege level on SPRs Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` Alexander Graf [this message]
2011-08-25 14:39   ` [PATCH 04/14] KVM: PPC: Interpret SDR1 as HVA in PAPR mode Alexander Graf
2011-08-25 14:39 ` [PATCH 05/14] KVM: PPC: Read out syscall instruction on trap Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` [PATCH 06/14] KVM: PPC: Add support for explicit HIOR setting Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` [PATCH 07/14] KVM: PPC: Add PAPR hypercall code for PR mode Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` [PATCH 08/14] KVM: PPC: Stub emulate CFAR and PURR SPRs Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` [PATCH 09/14] KVM: PPC: Support SC1 hypercalls for PAPR in PR mode Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` [PATCH 10/14] KVM: PPC: Enable the PAPR CAP for Book3S Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-31  8:31   ` Avi Kivity
2011-08-31  8:31     ` Avi Kivity
2011-08-31  8:37     ` Alexander Graf
2011-08-31  8:37       ` Alexander Graf
2011-08-31  8:39       ` Avi Kivity
2011-08-31  8:39         ` Avi Kivity
2011-08-25 14:39 ` [PATCH 11/14] KVM: PPC: Add sanity checking to vcpu_run Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` [PATCH 12/14] KVM: PPC: Assemble book3s{,_hv}_rmhandlers.S separately Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` [PATCH 13/14] KVM: PPC: book3s_pr: Simplify transitions between virtual and real mode Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-25 14:39 ` [PATCH 14/14] KVM: PPC: Implement H_CEDE hcall for book3s_hv in real-mode code Alexander Graf
2011-08-25 14:39   ` Alexander Graf
2011-08-31  9:41 ` [PULL 00/14] ppc patch queue 2011-08-25 Avi Kivity
2011-08-31  9:41   ` Avi Kivity

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=1314283193-10323-5-git-send-email-agraf@suse.de \
    --to=agraf@suse.de \
    --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.