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 v2 2/7] always call kvm_write_guest
Date: Mon, 30 Aug 2010 12:06:19 -0400 [thread overview]
Message-ID: <1283184391-7785-4-git-send-email-glommer@redhat.com> (raw)
In-Reply-To: <1283184391-7785-3-git-send-email-glommer@redhat.com>
This patch makes sure that kvm_write_guest() is called
at every guest enter. We do not, however, want to update
all the structure at all times, so we add a flag
that basically tells it whether or not to do the whole operation
Signed-off-by: Glauber Costa <glommer@redhat.com>
---
arch/x86/kvm/x86.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e7e3b50..f4b77ea 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -895,7 +895,7 @@ static void kvm_set_time_scale(uint32_t tsc_khz, struct pvclock_vcpu_time_info *
static DEFINE_PER_CPU(unsigned long, cpu_tsc_khz);
-static void kvm_write_guest_time(struct kvm_vcpu *v)
+static void kvm_write_guest_time(struct kvm_vcpu *v, bool update_time)
{
struct timespec ts;
unsigned long flags;
@@ -906,6 +906,9 @@ static void kvm_write_guest_time(struct kvm_vcpu *v)
if ((!vcpu->time_page))
return;
+ if (!update_time)
+ return;
+
this_tsc_khz = get_cpu_var(cpu_tsc_khz);
if (unlikely(vcpu->hv_clock_tsc_khz != this_tsc_khz)) {
kvm_set_time_scale(this_tsc_khz, &vcpu->hv_clock);
@@ -4671,6 +4674,7 @@ static void kvm_put_guest_xcr0(struct kvm_vcpu *vcpu)
static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
{
int r;
+ bool update_kvm_time = 0;
bool req_int_win = !irqchip_in_kernel(vcpu->kvm) &&
vcpu->run->request_interrupt_window;
@@ -4680,7 +4684,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
if (kvm_check_request(KVM_REQ_MIGRATE_TIMER, vcpu))
__kvm_migrate_timers(vcpu);
if (kvm_check_request(KVM_REQ_KVMCLOCK_UPDATE, vcpu))
- kvm_write_guest_time(vcpu);
+ update_kvm_time = 1;
if (kvm_check_request(KVM_REQ_MMU_SYNC, vcpu))
kvm_mmu_sync_roots(vcpu);
if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu))
@@ -4701,6 +4705,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
}
}
+ kvm_write_guest_time(vcpu, update_kvm_time);
+
r = kvm_mmu_reload(vcpu);
if (unlikely(r))
goto out;
--
1.6.2.2
next prev parent reply other threads:[~2010-08-30 16:23 UTC|newest]
Thread overview: 39+ 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 ` Glauber Costa [this message]
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 ` [RFC 6/8] " Glauber Costa
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
2010-08-30 17:06 [RFC v2 0/7] kvm steal time implementation proposal Glauber Costa
2010-08-30 17:06 ` [RFC v2 2/7] always call kvm_write_guest Glauber Costa
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-4-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).