public inbox for kvm-ppc@vger.kernel.org
 help / color / mirror / Atom feed
From: Alexander Graf <agraf@suse.de>
To: kvm-ppc@vger.kernel.org
Cc: kvm@vger.kernel.org
Subject: [PATCH 17/56] KVM: PPC: e500mc: Add doorbell emulation support
Date: Thu, 15 Mar 2012 12:10:46 +0000	[thread overview]
Message-ID: <1331813485-14722-18-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1331813485-14722-1-git-send-email-agraf@suse.de>

When one vcpu wants to kick another, it can issue a special IPI instruction
called msgsnd. This patch emulates this instruction, its clearing counterpart
and the infrastructure required to actually trigger that interrupt inside
a guest vcpu.

With this patch, SMP guests on e500mc work.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 arch/powerpc/include/asm/dbell.h |    2 +
 arch/powerpc/kvm/booke.c         |    2 +
 arch/powerpc/kvm/e500_emulate.c  |   68 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/include/asm/dbell.h b/arch/powerpc/include/asm/dbell.h
index d7365b0..154c067 100644
--- a/arch/powerpc/include/asm/dbell.h
+++ b/arch/powerpc/include/asm/dbell.h
@@ -19,7 +19,9 @@
 
 #define PPC_DBELL_MSG_BRDCAST	(0x04000000)
 #define PPC_DBELL_TYPE(x)	(((x) & 0xf) << (63-36))
+#define PPC_DBELL_TYPE_MASK	PPC_DBELL_TYPE(0xf)
 #define PPC_DBELL_LPID(x)	((x) << (63 - 49))
+#define PPC_DBELL_PIR_MASK	0x3fff
 enum ppc_dbell {
 	PPC_DBELL = 0,		/* doorbell */
 	PPC_DBELL_CRIT = 1,	/* critical doorbell */
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 0b77be1..85bd5b8 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -326,6 +326,7 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,
 		int_class = INT_CLASS_NONCRIT;
 		break;
 	case BOOKE_IRQPRIO_CRITICAL:
+	case BOOKE_IRQPRIO_DBELL_CRIT:
 		allowed = vcpu->arch.shared->msr & MSR_CE;
 		allowed = allowed && !crit;
 		msr_mask = MSR_GS | MSR_ME;
@@ -342,6 +343,7 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,
 		keep_irq = true;
 		/* fall through */
 	case BOOKE_IRQPRIO_EXTERNAL:
+	case BOOKE_IRQPRIO_DBELL:
 		allowed = vcpu->arch.shared->msr & MSR_EE;
 		allowed = allowed && !crit;
 		msr_mask = MSR_GS | MSR_CE | MSR_ME | MSR_DE;
diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 98b6c1c..99155f8 100644
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -14,16 +14,74 @@
 
 #include <asm/kvm_ppc.h>
 #include <asm/disassemble.h>
+#include <asm/dbell.h>
 
 #include "booke.h"
 #include "e500.h"
 
+#define XOP_MSGSND  206
+#define XOP_MSGCLR  238
 #define XOP_TLBIVAX 786
 #define XOP_TLBSX   914
 #define XOP_TLBRE   946
 #define XOP_TLBWE   978
 #define XOP_TLBILX  18
 
+#ifdef CONFIG_KVM_E500MC
+static int dbell2prio(ulong param)
+{
+	int msg = param & PPC_DBELL_TYPE_MASK;
+	int prio = -1;
+
+	switch (msg) {
+	case PPC_DBELL_TYPE(PPC_DBELL):
+		prio = BOOKE_IRQPRIO_DBELL;
+		break;
+	case PPC_DBELL_TYPE(PPC_DBELL_CRIT):
+		prio = BOOKE_IRQPRIO_DBELL_CRIT;
+		break;
+	default:
+		break;
+	}
+
+	return prio;
+}
+
+static int kvmppc_e500_emul_msgclr(struct kvm_vcpu *vcpu, int rb)
+{
+	ulong param = vcpu->arch.gpr[rb];
+	int prio = dbell2prio(param);
+
+	if (prio < 0)
+		return EMULATE_FAIL;
+
+	clear_bit(prio, &vcpu->arch.pending_exceptions);
+	return EMULATE_DONE;
+}
+
+static int kvmppc_e500_emul_msgsnd(struct kvm_vcpu *vcpu, int rb)
+{
+	ulong param = vcpu->arch.gpr[rb];
+	int prio = dbell2prio(rb);
+	int pir = param & PPC_DBELL_PIR_MASK;
+	int i;
+	struct kvm_vcpu *cvcpu;
+
+	if (prio < 0)
+		return EMULATE_FAIL;
+
+	kvm_for_each_vcpu(i, cvcpu, vcpu->kvm) {
+		int cpir = cvcpu->arch.shared->pir;
+		if ((param & PPC_DBELL_MSG_BRDCAST) || (cpir = pir)) {
+			set_bit(prio, &cvcpu->arch.pending_exceptions);
+			kvm_vcpu_kick(cvcpu);
+		}
+	}
+
+	return EMULATE_DONE;
+}
+#endif
+
 int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                            unsigned int inst, int *advance)
 {
@@ -36,6 +94,16 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
 	case 31:
 		switch (get_xop(inst)) {
 
+#ifdef CONFIG_KVM_E500MC
+		case XOP_MSGSND:
+			emulated = kvmppc_e500_emul_msgsnd(vcpu, get_rb(inst));
+			break;
+
+		case XOP_MSGCLR:
+			emulated = kvmppc_e500_emul_msgclr(vcpu, get_rb(inst));
+			break;
+#endif
+
 		case XOP_TLBRE:
 			emulated = kvmppc_e500_emul_tlbre(vcpu);
 			break;
-- 
1.6.0.2


  parent reply	other threads:[~2012-03-15 12:10 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-15 12:10 [PULL 00/56] ppc patch queue 2012-03-15 Alexander Graf
2012-03-15 12:10 ` [PATCH 01/56] KVM: PPC: Book3s_32: Fix compile error Alexander Graf
2012-03-15 12:10 ` [PATCH 02/56] powerpc/booke: Set CPU_FTR_DEBUG_LVL_EXC on 32-bit Alexander Graf
2012-03-15 12:10 ` [PATCH 03/56] powerpc/e500: split CPU_FTRS_ALWAYS/CPU_FTRS_POSSIBLE Alexander Graf
2012-03-15 12:10 ` [PATCH 04/56] KVM: PPC: factor out lpid allocator from book3s_64_mmu_hv Alexander Graf
2012-03-15 12:10 ` [PATCH 05/56] KVM: PPC: booke: add booke-level vcpu load/put Alexander Graf
2012-03-15 12:10 ` [PATCH 06/56] KVM: PPC: booke: Move vm core init/destroy out of booke.c Alexander Graf
2012-03-15 12:10 ` [PATCH 07/56] KVM: PPC: e500: rename e500_tlb.h to e500.h Alexander Graf
2012-03-15 12:10 ` [PATCH 08/56] KVM: PPC: e500: merge <asm/kvm_e500.h> into arch/powerpc/kvm/e500.h Alexander Graf
2012-03-15 12:10 ` [PATCH 09/56] KVM: PPC: e500: clean up arch/powerpc/kvm/e500.h Alexander Graf
2012-03-15 12:10 ` [PATCH 10/56] KVM: PPC: e500: refactor core-specific TLB code Alexander Graf
2012-03-15 12:10 ` [PATCH 11/56] KVM: PPC: e500: Track TLB1 entries with a bitmap Alexander Graf
2012-03-15 12:10 ` [PATCH 12/56] KVM: PPC: e500: emulate tlbilx Alexander Graf
2012-03-15 12:10 ` [PATCH 13/56] powerpc/booke: Provide exception macros with interrupt name Alexander Graf
2012-03-15 12:10 ` [PATCH 14/56] KVM: PPC: booke: category E.HV (GS-mode) support Alexander Graf
2012-03-15 12:10 ` [PATCH 15/56] KVM: PPC: booke: standard PPC floating point support Alexander Graf
2012-03-15 12:10 ` [PATCH 16/56] KVM: PPC: e500mc support Alexander Graf
2012-03-15 12:10 ` Alexander Graf [this message]
2012-03-15 12:10 ` [PATCH 18/56] KVM: PPC: e500mc: implicitly set MSR_GS Alexander Graf
2012-03-15 12:10 ` [PATCH 19/56] KVM: PPC: e500mc: Move r1/r2 restoration very early Alexander Graf
2012-03-15 12:10 ` [PATCH 20/56] KVM: PPC: e500mc: add load inst fixup Alexander Graf
2012-03-15 12:10 ` [PATCH 21/56] KVM: PPC: rename CONFIG_KVM_E500 -> CONFIG_KVM_E500V2 Alexander Graf
2012-03-15 12:10 ` [PATCH 22/56] KVM: PPC: make e500v2 kvm and e500mc cpu mutually exclusive Alexander Graf
2012-03-15 12:10 ` [PATCH 23/56] KVM: PPC: booke: remove leftover debugging Alexander Graf
2012-03-15 12:10 ` [PATCH 24/56] KVM: PPC: booke: deliver program int on emulation failure Alexander Graf
2012-03-15 12:10 ` [PATCH 25/56] KVM: PPC: booke: rework rescheduling checks Alexander Graf
2012-03-15 12:10 ` [PATCH 26/56] KVM: PPC: booke: BOOKE_IRQPRIO_MAX is n+1 Alexander Graf
2012-03-15 12:10 ` [PATCH 27/56] KVM: PPC: bookehv: fix exit timing Alexander Graf
2012-03-15 12:10 ` [PATCH 28/56] KVM: PPC: bookehv: remove negation for CONFIG_64BIT Alexander Graf
2012-03-15 12:10 ` [PATCH 29/56] KVM: PPC: bookehv: remove SET_VCPU Alexander Graf
2012-03-15 12:10 ` [PATCH 30/56] KVM: PPC: bookehv: disable MAS register updates early Alexander Graf
2012-03-15 12:11 ` [PATCH 31/56] KVM: PPC: bookehv: add comment about shadow_msr Alexander Graf
2012-03-15 12:11 ` [PATCH 32/56] KVM: PPC: booke: Readd debug abort code for machine check Alexander Graf
2012-03-15 12:11 ` [PATCH 33/56] KVM: PPC: booke: add GS documentation for program interrupt Alexander Graf
2012-03-15 12:11 ` [PATCH 34/56] KVM: PPC: bookehv: remove unused code Alexander Graf
2012-03-15 12:11 ` [PATCH 35/56] KVM: PPC: e500: fix typo in tlb code Alexander Graf
2012-03-15 12:11 ` [PATCH 36/56] KVM: PPC: booke: Support perfmon interrupts Alexander Graf
2012-03-15 12:11 ` [PATCH 37/56] KVM: PPC: booke: expose good state on irq reinject Alexander Graf
2012-03-15 12:11 ` [PATCH 38/56] KVM: PPC: booke: Reinject performance monitor interrupts Alexander Graf
2012-03-15 12:11 ` [PATCH 39/56] KVM: PPC: Booke: only prepare to enter when we enter Alexander Graf
2012-03-15 12:11 ` [PATCH 40/56] KVM: PPC: Book3s: PR: Add SPAPR H_BULK_REMOVE support Alexander Graf
2012-03-15 12:11 ` [PATCH 41/56] KVM: PPC: Book3S HV: Fix kvm_alloc_linear in case where no linears exist Alexander Graf
2012-03-15 12:11 ` [PATCH 42/56] KVM: PPC: Book3S HV: Save and restore CR in __kvmppc_vcore_entry Alexander Graf
2012-03-15 12:11 ` [PATCH 43/56] KVM: PPC: Save/Restore CR over vcpu_run Alexander Graf
2012-03-15 12:11 ` [PATCH 44/56] KVM: PPC: Book3S HV: Make secondary threads more robust against stray IPIs Alexander Graf
2012-03-15 12:11 ` [PATCH 45/56] KVM: PPC: Book3S HV: Make virtual processor area registration more robust Alexander Graf
2012-03-15 12:11 ` [PATCH 46/56] KVM: PPC: Book3S HV: Report stolen time to guest through dispatch trace log Alexander Graf
2012-03-15 12:11 ` [PATCH 47/56] Restore guest CR after exit timing calculation Alexander Graf
2012-03-15 12:11 ` [PATCH 48/56] KVM: PPC: Book 3S: Fix compilation for !HV configs Alexander Graf
2012-03-15 12:11 ` [PATCH 49/56] KVM: PPC: Work around POWER7 DABR corruption problem Alexander Graf
2012-03-15 12:11 ` [PATCH 50/56] KVM: PPC: Pass EA to updating emulation ops Alexander Graf
2012-03-15 12:11 ` [PATCH 51/56] KVM: PPC: Book3S: Compile fix for ppc32 in HIOR Alexander Graf
2012-03-15 12:11 ` [PATCH 52/56] KVM: PPC: Emulate tw and td instructions Alexander Graf
2012-03-15 12:11 ` [PATCH 53/56] KVM: PPC: Book3s: PR: Add HV traps so we can run in HV=1 mode on p7 Alexander Graf
2012-03-15 12:11 ` [PATCH 54/56] KVM: PPC: Book3S: PR: Fix preemption Alexander Graf
2012-03-15 12:11 ` [PATCH 55/56] KVM: PPC: Ignore unhalt request from kvm_vcpu_block Alexander Graf
2012-03-15 12:11 ` [PATCH 56/56] powerpc/kvm: Fix magic page vs. 32-bit RTAS on ppc64 Alexander Graf
2012-03-20 14:47 ` [PULL 00/56] ppc patch queue 2012-03-15 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=1331813485-14722-18-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox