From: Glauber Costa <glommer@redhat.com>
To: kvm@vger.kernel.org
Cc: avi@redhat.com, zamsden@redhat.com, mtosatti@redhat.com,
riel@redhat.com, peterz@infradead.org, mingo@elte.hu,
jeremy@goop.org
Subject: [RFC 6/8] kvm steal time implementation
Date: Mon, 30 Aug 2010 12:06:27 -0400 [thread overview]
Message-ID: <1283184391-7785-12-git-send-email-glommer@redhat.com> (raw)
In-Reply-To: <1283184391-7785-11-git-send-email-glommer@redhat.com>
This is the proposed kvm-side steal time implementation.
It is migration safe, as it checks flags at every read.
Signed-off-by: Glauber Costa <glommer@redhat.com>
---
arch/x86/kernel/kvmclock.c | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index eb9b76c..a1f4852 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -18,6 +18,8 @@
#include <linux/clocksource.h>
#include <linux/kvm_para.h>
+#include <linux/kernel_stat.h>
+#include <linux/sched.h>
#include <asm/pvclock.h>
#include <asm/msr.h>
#include <asm/apic.h>
@@ -41,6 +43,7 @@ early_param("no-kvmclock", parse_no_kvmclock);
/* The hypervisor will put information about time periodically here */
static DEFINE_PER_CPU_SHARED_ALIGNED(struct pvclock_vcpu_time_info, hv_clock);
+static DEFINE_PER_CPU(u64, steal_info);
static struct pvclock_wall_clock wall_clock;
/*
@@ -82,6 +85,32 @@ static cycle_t kvm_clock_read(void)
return ret;
}
+static DEFINE_PER_CPU(u64, steal_info);
+
+cputime_t kvm_get_steal_time(void)
+{
+ u64 delta = 0;
+ u64 *last_steal_info, this_steal_info;
+ struct pvclock_vcpu_time_info *src;
+
+ src = &get_cpu_var(hv_clock);
+ if (!(src->flags & PVCLOCK_STEAL_BIT))
+ goto out;
+
+ this_steal_info = src->steal_time;
+ put_cpu_var(hv_clock);
+
+ last_steal_info = &get_cpu_var(steal_info);
+
+ delta = this_steal_info - *last_steal_info;
+
+ *last_steal_info = this_steal_info;
+ put_cpu_var(steal_info);
+
+out:
+ return msecs_to_cputime(delta);
+}
+
static cycle_t kvm_clock_get_cycles(struct clocksource *cs)
{
return kvm_clock_read();
@@ -134,6 +163,8 @@ static int kvm_register_clock(char *txt)
printk(KERN_INFO "kvm-clock: cpu %d, msr %x:%x, %s\n",
cpu, high, low, txt);
+ per_cpu(steal_info, cpu) = 0;
+
return native_write_msr_safe(msr_kvm_system_time, low, high);
}
@@ -218,4 +249,8 @@ void __init kvmclock_init(void)
if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE_STABLE_BIT))
pvclock_set_flags(PVCLOCK_TSC_STABLE_BIT);
+
+
+ if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE_STEAL_BIT))
+ hypervisor_steal_time = kvm_get_steal_time;
}
--
1.6.2.2
next prev parent reply other threads:[~2010-08-30 16:23 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-30 16:06 [RFC v2 0/7] kvm stael time implementation Glauber Costa
2010-08-30 16:06 ` [RFC v2 1/7] change headers preparing for steal time Glauber Costa
2010-08-30 16:06 ` [RFC 1/8] Implement getnsboottime kernel API Glauber Costa
2010-08-30 16:06 ` [RFC v2 2/7] always call kvm_write_guest Glauber Costa
2010-08-30 16:06 ` [RFC 2/8] change headers preparing for steal time Glauber Costa
2010-08-30 16:06 ` [RFC 3/8] always call kvm_write_guest Glauber Costa
2010-08-30 16:06 ` [RFC v2 3/7] measure time out of guest Glauber Costa
2010-08-30 16:06 ` [RFC v2 4/7] change kernel accounting to include steal time Glauber Costa
2010-08-30 16:06 ` [RFC 4/8] measure time out of guest Glauber Costa
2010-08-30 16:06 ` [RFC 5/8] change kernel accounting to include steal time Glauber Costa
2010-08-30 16:06 ` [RFC v2 5/7] kvm steal time implementation Glauber Costa
2010-08-30 16:06 ` Glauber Costa [this message]
2010-08-30 16:06 ` [RFC v2 6/7] touch softlockup watchdog Glauber Costa
2010-08-30 16:06 ` [RFC v2 7/7] tell guest about steal time feature Glauber Costa
2010-08-30 16:06 ` [RFC 7/8] touch softlockup watchdog Glauber Costa
2010-08-30 16:06 ` [RFC 8/8] tell guest about steal time feature Glauber Costa
2010-08-30 17:33 ` [RFC v2 6/7] touch softlockup watchdog Jeremy Fitzhardinge
2010-08-30 18:07 ` Glauber Costa
2010-08-30 16:46 ` [RFC 5/8] change kernel accounting to include steal time Peter Zijlstra
2010-08-30 17:26 ` Glauber Costa
2010-08-30 17:30 ` [RFC v2 4/7] " Jeremy Fitzhardinge
2010-08-30 18:39 ` Rik van Riel
2010-08-30 19:07 ` Jeremy Fitzhardinge
2010-08-30 19:14 ` Peter Zijlstra
2010-08-30 19:17 ` Rik van Riel
2010-08-30 19:20 ` Peter Zijlstra
2010-08-30 19:45 ` Rik van Riel
2010-08-30 22:56 ` Jeremy Fitzhardinge
2010-08-30 23:03 ` Rik van Riel
2010-08-31 8:11 ` Peter Zijlstra
2010-09-02 18:19 ` Glauber Costa
2010-09-03 3:24 ` Jeremy Fitzhardinge
2010-09-03 7:18 ` Peter Zijlstra
2010-09-01 23:56 ` [RFC 1/8] Implement getnsboottime kernel API Zachary Amsden
2010-08-30 16:37 ` [RFC v2 0/7] kvm stael time implementation Peter Zijlstra
2010-08-30 16:45 ` Jeremy Fitzhardinge
2010-08-30 17:21 ` Glauber Costa
2010-08-30 17:20 ` Jeremy Fitzhardinge
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=1283184391-7785-12-git-send-email-glommer@redhat.com \
--to=glommer@redhat.com \
--cc=avi@redhat.com \
--cc=jeremy@goop.org \
--cc=kvm@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mtosatti@redhat.com \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=zamsden@redhat.com \
/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;
as well as URLs for NNTP newsgroup(s).