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, Paul Mackerras <paulus@samba.org>
Subject: [PATCH 46/56] KVM: PPC: Book3S HV: Report stolen time to guest through dispatch trace log
Date: Thu, 15 Mar 2012 12:11:15 +0000	[thread overview]
Message-ID: <1331813485-14722-47-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1331813485-14722-1-git-send-email-agraf@suse.de>

From: Paul Mackerras <paulus@samba.org>

This adds code to measure "stolen" time per virtual core in units of
timebase ticks, and to report the stolen time to the guest using the
dispatch trace log (DTL).  The guest can register an area of memory
for the DTL for a given vcpu.  The DTL is a ring buffer where KVM
fills in one entry every time it enters the guest for that vcpu.

Stolen time is measured as time when the virtual core is not running,
either because the vcore is not runnable (e.g. some of its vcpus are
executing elsewhere in the kernel or in userspace), or when the vcpu
thread that is running the vcore is preempted.  This includes time
when all the vcpus are idle (i.e. have executed the H_CEDE hypercall),
which is OK because the guest accounts stolen time while idle as idle
time.

Each vcpu keeps a record of how much stolen time has been reported to
the guest for that vcpu so far.  When we are about to enter the guest,
we create a new DTL entry (if the guest vcpu has a DTL) and report the
difference between total stolen time for the vcore and stolen time
reported so far for the vcpu as the "enqueue to dispatch" time in the
DTL entry.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 arch/powerpc/include/asm/kvm_host.h |    4 +++
 arch/powerpc/kvm/book3s_hv.c        |   46 ++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index 93ffd8d..014eaf2 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -268,6 +268,9 @@ struct kvmppc_vcore {
 	struct list_head runnable_threads;
 	spinlock_t lock;
 	wait_queue_head_t wq;
+	u64 stolen_tb;
+	u64 preempt_tb;
+	struct kvm_vcpu *runner;
 };
 
 #define VCORE_ENTRY_COUNT(vc)	((vc)->entry_exit_count & 0xff)
@@ -516,6 +519,7 @@ struct kvm_vcpu_arch {
 	struct kvmppc_vpa dtl;
 	struct dtl_entry *dtl_ptr;
 	unsigned long dtl_index;
+	u64 stolen_logged;
 	struct kvmppc_vpa slb_shadow;
 #endif
 };
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index bbe967e..012ea89 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -59,12 +59,20 @@ static int kvmppc_hv_setup_rma(struct kvm_vcpu *vcpu);
 
 void kvmppc_core_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 {
+	struct kvmppc_vcore *vc = vcpu->arch.vcore;
+
 	local_paca->kvm_hstate.kvm_vcpu = vcpu;
-	local_paca->kvm_hstate.kvm_vcore = vcpu->arch.vcore;
+	local_paca->kvm_hstate.kvm_vcore = vc;
+	if (vc->runner = vcpu && vc->vcore_state != VCORE_INACTIVE)
+		vc->stolen_tb += mftb() - vc->preempt_tb;
 }
 
 void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu)
 {
+	struct kvmppc_vcore *vc = vcpu->arch.vcore;
+
+	if (vc->runner = vcpu && vc->vcore_state != VCORE_INACTIVE)
+		vc->preempt_tb = mftb();
 }
 
 void kvmppc_set_msr(struct kvm_vcpu *vcpu, u64 msr)
@@ -304,6 +312,35 @@ static void kvmppc_update_vpas(struct kvm_vcpu *vcpu)
 	spin_unlock(&vcpu->arch.vpa_update_lock);
 }
 
+static void kvmppc_create_dtl_entry(struct kvm_vcpu *vcpu,
+				    struct kvmppc_vcore *vc)
+{
+	struct dtl_entry *dt;
+	struct lppaca *vpa;
+	unsigned long old_stolen;
+
+	dt = vcpu->arch.dtl_ptr;
+	vpa = vcpu->arch.vpa.pinned_addr;
+	old_stolen = vcpu->arch.stolen_logged;
+	vcpu->arch.stolen_logged = vc->stolen_tb;
+	if (!dt || !vpa)
+		return;
+	memset(dt, 0, sizeof(struct dtl_entry));
+	dt->dispatch_reason = 7;
+	dt->processor_id = vc->pcpu + vcpu->arch.ptid;
+	dt->timebase = mftb();
+	dt->enqueue_to_dispatch_time = vc->stolen_tb - old_stolen;
+	dt->srr0 = kvmppc_get_pc(vcpu);
+	dt->srr1 = vcpu->arch.shregs.msr;
+	++dt;
+	if (dt = vcpu->arch.dtl.pinned_end)
+		dt = vcpu->arch.dtl.pinned_addr;
+	vcpu->arch.dtl_ptr = dt;
+	/* order writing *dt vs. writing vpa->dtl_idx */
+	smp_wmb();
+	vpa->dtl_idx = ++vcpu->arch.dtl_index;
+}
+
 int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)
 {
 	unsigned long req = kvmppc_get_gpr(vcpu, 3);
@@ -567,6 +604,7 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 			INIT_LIST_HEAD(&vcore->runnable_threads);
 			spin_lock_init(&vcore->lock);
 			init_waitqueue_head(&vcore->wq);
+			vcore->preempt_tb = mftb();
 		}
 		kvm->arch.vcores[core] = vcore;
 	}
@@ -579,6 +617,7 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 	++vcore->num_threads;
 	spin_unlock(&vcore->lock);
 	vcpu->arch.vcore = vcore;
+	vcpu->arch.stolen_logged = vcore->stolen_tb;
 
 	vcpu->arch.cpu_type = KVM_CPU_3S_64;
 	kvmppc_sanity_check(vcpu);
@@ -802,6 +841,7 @@ static int kvmppc_run_core(struct kvmppc_vcore *vc)
 	vc->nap_count = 0;
 	vc->entry_exit_count = 0;
 	vc->vcore_state = VCORE_RUNNING;
+	vc->stolen_tb += mftb() - vc->preempt_tb;
 	vc->in_guest = 0;
 	vc->pcpu = smp_processor_id();
 	vc->napping_threads = 0;
@@ -811,6 +851,7 @@ static int kvmppc_run_core(struct kvmppc_vcore *vc)
 		    vcpu->arch.slb_shadow.update_pending ||
 		    vcpu->arch.dtl.update_pending)
 			kvmppc_update_vpas(vcpu);
+		kvmppc_create_dtl_entry(vcpu, vc);
 	}
 	/* Grab any remaining hw threads so they can't go into the kernel */
 	for (i = ptid; i < threads_per_core; ++i)
@@ -868,6 +909,7 @@ static int kvmppc_run_core(struct kvmppc_vcore *vc)
 	spin_lock(&vc->lock);
  out:
 	vc->vcore_state = VCORE_INACTIVE;
+	vc->preempt_tb = mftb();
 	list_for_each_entry_safe(vcpu, vnext, &vc->runnable_threads,
 				 arch.run_list) {
 		if (vcpu->arch.ret != RESUME_GUEST) {
@@ -966,6 +1008,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
 			spin_lock(&vc->lock);
 			continue;
 		}
+		vc->runner = vcpu;
 		n_ceded = 0;
 		list_for_each_entry(v, &vc->runnable_threads, arch.run_list)
 			n_ceded += v->arch.ceded;
@@ -985,6 +1028,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
 				wake_up(&v->arch.cpu_run);
 			}
 		}
+		vc->runner = NULL;
 	}
 
 	if (signal_pending(current)) {
-- 
1.6.0.2


  parent reply	other threads:[~2012-03-15 12:11 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 ` [PATCH 17/56] KVM: PPC: e500mc: Add doorbell emulation support Alexander Graf
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 ` Alexander Graf [this message]
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-47-git-send-email-agraf@suse.de \
    --to=agraf@suse.de \
    --cc=kvm-ppc@vger.kernel.org \
    --cc=kvm@vger.kernel.org \
    --cc=paulus@samba.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