From: Avi Kivity <avi@redhat.com>
To: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 09/37] KVM: ppc: Add kvmppc_mmu_dtlb/itlb_miss for booke
Date: Fri, 27 Feb 2009 12:26:32 +0200 [thread overview]
Message-ID: <1235730420-7929-10-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1235730420-7929-1-git-send-email-avi@redhat.com>
From: Hollis Blanchard <hollisb@us.ibm.com>
When itlb or dtlb miss happens, E500 needs to update some mmu registers.
So that the auto-load mechanism can work on E500 when write a tlb entry.
Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---
arch/powerpc/include/asm/kvm_ppc.h | 2 ++
arch/powerpc/kvm/44x_tlb.c | 8 ++++++++
arch/powerpc/kvm/booke.c | 2 ++
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index 5e80a20..6052779 100644
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -63,6 +63,8 @@ extern int kvmppc_mmu_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);
extern int kvmppc_mmu_itlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);
extern gpa_t kvmppc_mmu_xlate(struct kvm_vcpu *vcpu, unsigned int gtlb_index,
gva_t eaddr);
+extern void kvmppc_mmu_dtlb_miss(struct kvm_vcpu *vcpu);
+extern void kvmppc_mmu_itlb_miss(struct kvm_vcpu *vcpu);
extern struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm,
unsigned int id);
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
index e67b731..4a16f47 100644
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
@@ -232,6 +232,14 @@ int kvmppc_mmu_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr)
return kvmppc_44x_tlb_index(vcpu, eaddr, vcpu->arch.pid, as);
}
+void kvmppc_mmu_itlb_miss(struct kvm_vcpu *vcpu)
+{
+}
+
+void kvmppc_mmu_dtlb_miss(struct kvm_vcpu *vcpu)
+{
+}
+
static void kvmppc_44x_shadow_release(struct kvmppc_vcpu_44x *vcpu_44x,
unsigned int stlb_index)
{
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index a73b395..933c406 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -295,6 +295,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DTLB_MISS);
vcpu->arch.dear = vcpu->arch.fault_dear;
vcpu->arch.esr = vcpu->arch.fault_esr;
+ kvmppc_mmu_dtlb_miss(vcpu);
kvmppc_account_exit(vcpu, DTLB_REAL_MISS_EXITS);
r = RESUME_GUEST;
break;
@@ -337,6 +338,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
if (gtlb_index < 0) {
/* The guest didn't have a mapping for it. */
kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_ITLB_MISS);
+ kvmppc_mmu_itlb_miss(vcpu);
kvmppc_account_exit(vcpu, ITLB_REAL_MISS_EXITS);
break;
}
--
1.6.0.6
next prev parent reply other threads:[~2009-02-27 10:30 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-27 10:26 [PATCH 00/37] KVM Updates for the 2.6.30 merge window (2/3) Avi Kivity
2009-02-27 10:26 ` [PATCH 01/37] KVM: ppc: rename 44x MMU functions used in booke.c Avi Kivity
2009-02-27 10:26 ` [PATCH 02/37] KVM: ppc: remove last 44x-specific bits from booke.c Avi Kivity
2009-02-27 10:26 ` [PATCH 03/37] KVM: ppc: use macros instead of hardcoded literals for instruction decoding Avi Kivity
2009-02-27 10:26 ` [PATCH 04/37] KVM: ppc: split out common Book E instruction emulation Avi Kivity
2009-02-27 10:26 ` [PATCH 05/37] KVM: ppc: Add dbsr in kvm_vcpu_arch Avi Kivity
2009-02-27 10:26 ` [PATCH 06/37] KVM: ppc: No need to include core-header for KVM in asm-offsets.c currently Avi Kivity
2009-02-27 10:26 ` [PATCH 07/37] KVM: ppc: ifdef iccci with CONFIG_44x Avi Kivity
2009-02-27 10:26 ` [PATCH 08/37] KVM: ppc: E500 core-specific code Avi Kivity
2009-02-27 10:26 ` Avi Kivity [this message]
2009-02-27 10:26 ` [PATCH 10/37] KVM: ppc: distinguish between interrupts and priorities Avi Kivity
2009-02-27 10:26 ` [PATCH 11/37] KVM: ppc: Add extra E500 exceptions Avi Kivity
2009-02-27 10:26 ` [PATCH 12/37] KVM: VMX: Fix guest state validity checks Avi Kivity
2009-02-27 10:26 ` [PATCH 13/37] KVM: VMX: don't clobber segment AR if emulating invalid state Avi Kivity
2009-02-27 10:26 ` [PATCH 14/37] KVM: VMX: Prevent exit handler from running if emulating due to " Avi Kivity
2009-02-27 10:26 ` [PATCH 15/37] KVM: x86 emulator: Make emulate_pop() a little more generic Avi Kivity
2009-02-27 10:26 ` [PATCH 16/37] KVM: VMX: When emulating on invalid vmx state, don't return to userspace unnecessarily Avi Kivity
2009-02-27 10:26 ` [PATCH 17/37] KVM: x86 emulator: implement 'ret far' instruction (opcode 0xcb) Avi Kivity
2009-02-27 10:26 ` [PATCH 18/37] KVM: Properly lock PIT creation Avi Kivity
2009-02-27 10:26 ` [PATCH 19/37] KVM: ppc: remove debug support broken by KVM debug rewrite Avi Kivity
2009-02-27 10:26 ` [PATCH 20/37] KVM: Remove duplicated prototype of kvm_arch_destroy_vm Avi Kivity
2009-02-27 10:26 ` [PATCH 21/37] KVM: Add support to disable MSI for assigned device Avi Kivity
2009-02-27 10:26 ` [PATCH 22/37] KVM: SVM: Add microcode patch level dummy Avi Kivity
2009-02-27 10:26 ` [PATCH 23/37] KVM: MMU: Optimize page unshadowing Avi Kivity
2009-02-27 10:26 ` [PATCH 24/37] KVM: Add CONFIG_HAVE_KVM_IRQCHIP Avi Kivity
2009-02-27 10:26 ` [PATCH 25/37] KVM: Interrupt mask notifiers for ioapic Avi Kivity
2009-02-27 10:26 ` [PATCH 26/37] KVM: Reset PIT irq injection logic when the PIT IRQ is unmasked Avi Kivity
2009-02-27 10:26 ` [PATCH 27/37] KVM: ia64: expose registers in struct kvm_regs Avi Kivity
2009-02-27 10:26 ` [PATCH 28/37] KVM: SVM: Fix typo in has_svm() Avi Kivity
2009-02-27 10:26 ` [PATCH 29/37] KVM: MMU: drop zeroing on mmu_memory_cache_alloc Avi Kivity
2009-02-27 10:26 ` [PATCH 30/37] KVM: MMU: Rename "metaphysical" attribute to "direct" Avi Kivity
2009-02-27 10:26 ` [PATCH 31/37] KVM: MMU: Only enable cr4_pge role in shadow mode Avi Kivity
2009-02-27 10:26 ` [PATCH 32/37] powerpc/fsl-booke: declare tlbcam_index for use in c Avi Kivity
2009-02-27 10:26 ` [PATCH 33/37] KVM: ppc: Fix e500 warnings and some spelling problems Avi Kivity
2009-02-27 10:26 ` [PATCH 34/37] KVM: ppc: Move to new TLB invalidate interface Avi Kivity
2009-02-27 10:26 ` [PATCH 35/37] KVM: x86: Fix typos and whitespace errors Avi Kivity
2009-02-27 10:26 ` [PATCH 36/37] KVM: Userspace controlled irq routing Avi Kivity
2009-02-27 10:27 ` [PATCH 37/37] KVM: Avoid using CONFIG_ in userspace visible headers 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=1235730420-7929-10-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome