From: Marcelo Tosatti <mtosatti@redhat.com>
To: kvm@vger.kernel.org
Cc: johnstul@us.ibm.com, jeremy@goop.org, glommer@parallels.com,
zamsden@gmail.com, gleb@redhat.com, avi@redhat.com,
pbonzini@redhat.com, Marcelo Tosatti <mtosatti@redhat.com>
Subject: [patch 14/16] KVM: x86: notifier for clocksource changes
Date: Wed, 31 Oct 2012 20:47:10 -0200 [thread overview]
Message-ID: <20121031224824.471993713@redhat.com> (raw)
In-Reply-To: 20121031224656.417434866@redhat.com
[-- Attachment #1: 15-add-kvm-req-pvclock-gtod-update --]
[-- Type: text/plain, Size: 2592 bytes --]
Register a notifier for clocksource change event. In case
the host switches to clock other than TSC, disable master
clock usage.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Index: vsyscall/arch/x86/kvm/x86.c
===================================================================
--- vsyscall.orig/arch/x86/kvm/x86.c
+++ vsyscall/arch/x86/kvm/x86.c
@@ -1218,6 +1218,7 @@ static bool kvm_get_time_and_clockread(s
return true;
}
+static atomic_t kvm_guest_has_master_clock = ATOMIC_INIT(0);
/*
*
@@ -1271,6 +1272,8 @@ static void pvclock_update_vm_gtod_copy(
ka->use_master_clock = kvm_get_time_and_clockread(
&ka->master_kernel_ns,
&ka->master_cycle_now);
+ if (ka->use_master_clock)
+ atomic_set(&kvm_guest_has_master_clock, 1);
vclock_mode = pvclock_gtod_data.clock.vclock_mode;
trace_kvm_update_master_clock(ka->use_master_clock, vclock_mode);
@@ -5124,6 +5127,44 @@ static void kvm_set_mmio_spte_mask(void)
kvm_mmu_set_mmio_spte_mask(mask);
}
+static void pvclock_gtod_update_fn(struct work_struct *work)
+{
+ struct kvm *kvm;
+ struct kvm_vcpu *vcpu;
+ int i;
+
+ raw_spin_lock(&kvm_lock);
+ list_for_each_entry(kvm, &vm_list, vm_list)
+ kvm_for_each_vcpu(i, vcpu, kvm)
+ set_bit(KVM_REQ_MASTERCLOCK_UPDATE, &vcpu->requests);
+ atomic_set(&kvm_guest_has_master_clock, 0);
+ raw_spin_unlock(&kvm_lock);
+}
+
+static DECLARE_WORK(pvclock_gtod_work, pvclock_gtod_update_fn);
+
+/*
+ * Notification about pvclock gtod data update.
+ */
+static int pvclock_gtod_notify(struct notifier_block *nb, unsigned long unused,
+ void *unused2)
+{
+ struct pvclock_gtod_data *gtod = &pvclock_gtod_data;
+
+ /* disable master clock if host does not trust, or does not
+ * use, TSC clocksource
+ */
+ if (gtod->clock.vclock_mode != VCLOCK_TSC &&
+ atomic_read(&kvm_guest_has_master_clock) != 0)
+ queue_work(system_long_wq, &pvclock_gtod_work);
+
+ return 0;
+}
+
+static struct notifier_block pvclock_gtod_notifier = {
+ .notifier_call = pvclock_gtod_notify,
+};
+
int kvm_arch_init(void *opaque)
{
int r;
@@ -5165,6 +5206,8 @@ int kvm_arch_init(void *opaque)
host_xcr0 = xgetbv(XCR_XFEATURE_ENABLED_MASK);
kvm_lapic_init();
+ pvclock_gtod_register_notifier(&pvclock_gtod_notifier);
+
return 0;
out:
@@ -5179,6 +5222,7 @@ void kvm_arch_exit(void)
cpufreq_unregister_notifier(&kvmclock_cpufreq_notifier_block,
CPUFREQ_TRANSITION_NOTIFIER);
unregister_hotcpu_notifier(&kvmclock_cpu_notifier_block);
+ pvclock_gtod_unregister_notifier(&pvclock_gtod_notifier);
kvm_x86_ops = NULL;
kvm_mmu_module_exit();
}
next prev parent reply other threads:[~2012-10-31 22:47 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-24 13:13 [patch 00/18] pvclock vsyscall support + KVM hypervisor support (v2) Marcelo Tosatti
2012-10-24 13:13 ` [patch 01/18] KVM: x86: retain pvclock guest stopped bit in guest memory Marcelo Tosatti
2012-10-24 13:13 ` [patch 02/18] x86: pvclock: make sure rdtsc doesnt speculate out of region Marcelo Tosatti
2012-10-24 13:13 ` [patch 03/18] x86: pvclock: remove pvclock_shadow_time Marcelo Tosatti
2012-10-30 9:23 ` Avi Kivity
2012-10-30 9:24 ` Avi Kivity
2012-10-24 13:13 ` [patch 04/18] x86: pvclock: create helper for pvclock data retrieval Marcelo Tosatti
2012-10-24 13:13 ` [patch 05/18] x86: pvclock: fix flags usage race Marcelo Tosatti
2012-10-24 13:13 ` [patch 06/18] x86: pvclock: introduce helper to read flags Marcelo Tosatti
2012-10-24 13:13 ` [patch 07/18] sched: add notifier for cross-cpu migrations Marcelo Tosatti
2012-10-24 13:13 ` [patch 08/18] x86: pvclock: generic pvclock vsyscall initialization Marcelo Tosatti
2012-10-29 14:18 ` Glauber Costa
2012-10-29 14:54 ` Marcelo Tosatti
2012-10-29 17:46 ` Jeremy Fitzhardinge
2012-10-29 14:39 ` Glauber Costa
2012-10-24 13:13 ` [patch 09/18] KVM: x86: introduce facility to support vsyscall pvclock, via MSR Marcelo Tosatti
2012-10-29 14:45 ` Glauber Costa
2012-10-29 17:44 ` Jeremy Fitzhardinge
2012-10-29 18:40 ` Marcelo Tosatti
2012-10-30 7:41 ` Glauber Costa
2012-10-30 9:39 ` Avi Kivity
2012-10-31 3:12 ` Marcelo Tosatti
2012-11-02 10:21 ` Glauber Costa
2012-10-30 7:38 ` Glauber Costa
2012-10-24 13:13 ` [patch 10/18] x86: kvm guest: pvclock vsyscall support Marcelo Tosatti
2012-10-24 13:13 ` [patch 11/18] x86: vsyscall: pass mode to gettime backend Marcelo Tosatti
2012-10-29 14:47 ` Glauber Costa
2012-10-29 18:41 ` Marcelo Tosatti
2012-10-30 7:42 ` Glauber Costa
2012-10-24 13:13 ` [patch 12/18] x86: vdso: pvclock gettime support Marcelo Tosatti
2012-10-29 14:59 ` Glauber Costa
2012-10-29 18:42 ` Marcelo Tosatti
2012-10-30 7:49 ` Glauber Costa
2012-10-31 3:16 ` Marcelo Tosatti
2012-10-24 13:13 ` [patch 13/18] KVM: x86: pass host_tsc to read_l1_tsc Marcelo Tosatti
2012-10-29 15:04 ` Glauber Costa
2012-10-29 18:45 ` Marcelo Tosatti
2012-10-30 7:55 ` Glauber Costa
2012-10-24 13:13 ` [patch 14/18] time: export time information for KVM pvclock Marcelo Tosatti
2012-11-10 1:02 ` John Stultz
2012-11-13 21:07 ` Marcelo Tosatti
2012-10-24 13:13 ` [patch 15/18] KVM: x86: implement PVCLOCK_TSC_STABLE_BIT pvclock flag Marcelo Tosatti
2012-10-30 8:34 ` Glauber Costa
2012-10-31 3:19 ` [patch 15/18] KVM: x86: implement PVCLOCK_TSC_STABLE_BIT pvclock flag\ Marcelo Tosatti
2012-10-24 13:13 ` [patch 16/18] KVM: x86: notifier for clocksource changes Marcelo Tosatti
2012-10-24 13:13 ` [patch 17/18] KVM: x86: add kvm_arch_vcpu_postcreate callback, move TSC initialization Marcelo Tosatti
2012-10-24 13:13 ` [patch 18/18] KVM: x86: require matched TSC offsets for master clock Marcelo Tosatti
2012-10-31 22:46 ` [patch 00/16] pvclock vsyscall support + KVM hypervisor support (v3) Marcelo Tosatti
2012-10-31 22:46 ` [patch 01/16] KVM: x86: retain pvclock guest stopped bit in guest memory Marcelo Tosatti
2012-11-01 10:39 ` Gleb Natapov
2012-11-01 20:51 ` Marcelo Tosatti
2012-11-01 13:44 ` Glauber Costa
2012-10-31 22:46 ` [patch 02/16] x86: pvclock: make sure rdtsc doesnt speculate out of region Marcelo Tosatti
2012-11-01 11:48 ` Gleb Natapov
2012-11-01 13:49 ` Glauber Costa
2012-11-01 13:51 ` Gleb Natapov
2012-11-01 20:56 ` Marcelo Tosatti
2012-11-01 22:13 ` Gleb Natapov
2012-11-01 22:21 ` Marcelo Tosatti
2012-11-02 6:02 ` Gleb Natapov
2012-10-31 22:46 ` [patch 03/16] x86: pvclock: remove pvclock_shadow_time Marcelo Tosatti
2012-11-01 13:52 ` Glauber Costa
2012-10-31 22:47 ` [patch 04/16] x86: pvclock: create helper for pvclock data retrieval Marcelo Tosatti
2012-11-01 14:04 ` Glauber Costa
2012-11-01 20:57 ` Marcelo Tosatti
2012-10-31 22:47 ` [patch 05/16] x86: pvclock: introduce helper to read flags Marcelo Tosatti
2012-11-01 14:07 ` Glauber Costa
2012-11-01 21:08 ` Marcelo Tosatti
2012-10-31 22:47 ` [patch 06/16] sched: add notifier for cross-cpu migrations Marcelo Tosatti
2012-11-01 14:08 ` Glauber Costa
2012-10-31 22:47 ` [patch 07/16] x86: pvclock: generic pvclock vsyscall initialization Marcelo Tosatti
2012-11-01 14:19 ` Glauber Costa
2012-10-31 22:47 ` [patch 08/16] KVM: x86: introduce facility to support vsyscall pvclock, via MSR Marcelo Tosatti
2012-11-01 14:28 ` Glauber Costa
2012-11-01 21:39 ` Marcelo Tosatti
2012-11-02 10:23 ` Glauber Costa
2012-11-02 13:00 ` Marcelo Tosatti
2012-11-05 8:03 ` Glauber Costa
2012-10-31 22:47 ` [patch 09/16] x86: kvm guest: pvclock vsyscall support Marcelo Tosatti
2012-11-02 9:42 ` Glauber Costa
2012-11-05 8:35 ` Marcelo Tosatti
2012-10-31 22:47 ` [patch 10/16] x86: vdso: pvclock gettime support Marcelo Tosatti
2012-11-01 14:41 ` Glauber Costa
2012-11-01 21:42 ` Marcelo Tosatti
2012-11-02 0:33 ` Marcelo Tosatti
2012-11-02 10:25 ` Glauber Costa
2012-11-14 10:42 ` Gleb Natapov
2012-11-14 22:42 ` Marcelo Tosatti
2012-10-31 22:47 ` [patch 11/16] KVM: x86: pass host_tsc to read_l1_tsc Marcelo Tosatti
2012-10-31 22:47 ` [patch 12/16] time: export time information for KVM pvclock Marcelo Tosatti
2012-10-31 22:47 ` [patch 13/16] KVM: x86: implement PVCLOCK_TSC_STABLE_BIT pvclock flag Marcelo Tosatti
2012-10-31 22:47 ` Marcelo Tosatti [this message]
2012-10-31 22:47 ` [patch 15/16] KVM: x86: add kvm_arch_vcpu_postcreate callback, move TSC initialization Marcelo Tosatti
2012-10-31 22:47 ` [patch 16/16] KVM: x86: require matched TSC offsets for master clock Marcelo Tosatti
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=20121031224824.471993713@redhat.com \
--to=mtosatti@redhat.com \
--cc=avi@redhat.com \
--cc=gleb@redhat.com \
--cc=glommer@parallels.com \
--cc=jeremy@goop.org \
--cc=johnstul@us.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=zamsden@gmail.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).