* [Qemu-devel] [PATCH] make tsc stable over migration and machine start
@ 2011-02-01 19:17 Glauber Costa
2011-02-01 20:26 ` [Qemu-devel] " Jan Kiszka
0 siblings, 1 reply; 3+ messages in thread
From: Glauber Costa @ 2011-02-01 19:17 UTC (permalink / raw)
To: kvm; +Cc: mtosatti, qemu-devel, avi
If the machine is stopped, we should not record two different tsc values
upon a save operation. The same problem happens with kvmclock.
But kvmclock is taking a different diretion, being now seen as a separate
device. Since this is unlikely to happen with the tsc, I am taking the
approach here of simply registering a handler for state change, and
using a per-CPUState variable that prevents double updates for the TSC.
Signed-off-by: Glauber Costa <glommer@redhat.com>
---
target-i386/cpu.h | 1 +
target-i386/kvm.c | 19 ++++++++++++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 6d619e8..7f1c4f8 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -732,6 +732,7 @@ typedef struct CPUX86State {
uint32_t sipi_vector;
uint32_t cpuid_kvm_features;
uint32_t cpuid_svm_features;
+ uint8_t update_tsc;
/* in order to simplify APIC support, we leave this pointer to the
user */
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index ecb8405..c3925be 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -302,6 +302,16 @@ void kvm_inject_x86_mce(CPUState *cenv, int bank, uint64_t status,
static int _kvm_arch_init_vcpu(CPUState *env);
+static void cpu_update_state(void *opaque, int running, int reason)
+{
+ CPUState *env = opaque;
+
+ if (!running) {
+ env->update_tsc = 1;
+ }
+}
+
+
int kvm_arch_init_vcpu(CPUState *env)
{
int r;
@@ -444,6 +454,8 @@ int kvm_arch_init_vcpu(CPUState *env)
}
#endif
+ qemu_add_vm_change_state_handler(cpu_update_state, env);
+
return kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data);
}
@@ -1093,7 +1105,12 @@ static int kvm_get_msrs(CPUState *env)
msrs[n++].index = MSR_STAR;
if (kvm_has_msr_hsave_pa(env))
msrs[n++].index = MSR_VM_HSAVE_PA;
- msrs[n++].index = MSR_IA32_TSC;
+
+ if (env->update_tsc) {
+ msrs[n++].index = MSR_IA32_TSC;
+ env->update_tsc = 0;
+ }
+
#ifdef TARGET_X86_64
if (lm_capable_kernel) {
msrs[n++].index = MSR_CSTAR;
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Qemu-devel] Re: [PATCH] make tsc stable over migration and machine start
2011-02-01 19:17 [Qemu-devel] [PATCH] make tsc stable over migration and machine start Glauber Costa
@ 2011-02-01 20:26 ` Jan Kiszka
2011-02-02 12:05 ` Glauber Costa
0 siblings, 1 reply; 3+ messages in thread
From: Jan Kiszka @ 2011-02-01 20:26 UTC (permalink / raw)
To: Glauber Costa; +Cc: mtosatti, qemu-devel, kvm, avi
[-- Attachment #1: Type: text/plain, Size: 2761 bytes --]
On 2011-02-01 20:17, Glauber Costa wrote:
> If the machine is stopped, we should not record two different tsc values
> upon a save operation. The same problem happens with kvmclock.
>
> But kvmclock is taking a different diretion, being now seen as a separate
> device. Since this is unlikely to happen with the tsc, I am taking the
> approach here of simply registering a handler for state change, and
> using a per-CPUState variable that prevents double updates for the TSC.
>
> Signed-off-by: Glauber Costa <glommer@redhat.com>
> ---
> target-i386/cpu.h | 1 +
> target-i386/kvm.c | 19 ++++++++++++++++++-
> 2 files changed, 19 insertions(+), 1 deletions(-)
>
> diff --git a/target-i386/cpu.h b/target-i386/cpu.h
> index 6d619e8..7f1c4f8 100644
> --- a/target-i386/cpu.h
> +++ b/target-i386/cpu.h
> @@ -732,6 +732,7 @@ typedef struct CPUX86State {
> uint32_t sipi_vector;
> uint32_t cpuid_kvm_features;
> uint32_t cpuid_svm_features;
> + uint8_t update_tsc;
bool please.
>
> /* in order to simplify APIC support, we leave this pointer to the
> user */
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index ecb8405..c3925be 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -302,6 +302,16 @@ void kvm_inject_x86_mce(CPUState *cenv, int bank, uint64_t status,
>
> static int _kvm_arch_init_vcpu(CPUState *env);
>
> +static void cpu_update_state(void *opaque, int running, int reason)
> +{
> + CPUState *env = opaque;
> +
> + if (!running) {
> + env->update_tsc = 1;
> + }
> +}
> +
> +
Additional blank line.
> int kvm_arch_init_vcpu(CPUState *env)
> {
> int r;
> @@ -444,6 +454,8 @@ int kvm_arch_init_vcpu(CPUState *env)
> }
> #endif
>
> + qemu_add_vm_change_state_handler(cpu_update_state, env);
> +
> return kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data);
> }
>
> @@ -1093,7 +1105,12 @@ static int kvm_get_msrs(CPUState *env)
> msrs[n++].index = MSR_STAR;
> if (kvm_has_msr_hsave_pa(env))
> msrs[n++].index = MSR_VM_HSAVE_PA;
> - msrs[n++].index = MSR_IA32_TSC;
> +
> + if (env->update_tsc) {
> + msrs[n++].index = MSR_IA32_TSC;
> + env->update_tsc = 0;
> + }
> +
> #ifdef TARGET_X86_64
> if (lm_capable_kernel) {
> msrs[n++].index = MSR_CSTAR;
Not quite the logic I'm using for kvmclock:
cpu_update_state()
if running
tsc_valid = false;
kvm_get_msrs()
...
if (!tsc_valid)
read_tsc
tsc_valid = !vm_running;
That ensure we always read the tsc while the VM is running, and not only
after it was stopped (might otherwise be "surprising" when once
visualizing the MSRs).
Jan
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* [Qemu-devel] Re: [PATCH] make tsc stable over migration and machine start
2011-02-01 20:26 ` [Qemu-devel] " Jan Kiszka
@ 2011-02-02 12:05 ` Glauber Costa
0 siblings, 0 replies; 3+ messages in thread
From: Glauber Costa @ 2011-02-02 12:05 UTC (permalink / raw)
To: Jan Kiszka; +Cc: mtosatti, qemu-devel, kvm, avi
On Tue, 2011-02-01 at 21:26 +0100, Jan Kiszka wrote:
> On 2011-02-01 20:17, Glauber Costa wrote:
> > If the machine is stopped, we should not record two different tsc values
> > upon a save operation. The same problem happens with kvmclock.
> >
> > But kvmclock is taking a different diretion, being now seen as a separate
> > device. Since this is unlikely to happen with the tsc, I am taking the
> > approach here of simply registering a handler for state change, and
> > using a per-CPUState variable that prevents double updates for the TSC.
> >
> > Signed-off-by: Glauber Costa <glommer@redhat.com>
> > ---
> > target-i386/cpu.h | 1 +
> > target-i386/kvm.c | 19 ++++++++++++++++++-
> > 2 files changed, 19 insertions(+), 1 deletions(-)
> >
> > diff --git a/target-i386/cpu.h b/target-i386/cpu.h
> > index 6d619e8..7f1c4f8 100644
> > --- a/target-i386/cpu.h
> > +++ b/target-i386/cpu.h
> > @@ -732,6 +732,7 @@ typedef struct CPUX86State {
> > uint32_t sipi_vector;
> > uint32_t cpuid_kvm_features;
> > uint32_t cpuid_svm_features;
> > + uint8_t update_tsc;
>
> bool please.
>
> >
> > /* in order to simplify APIC support, we leave this pointer to the
> > user */
> > diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> > index ecb8405..c3925be 100644
> > --- a/target-i386/kvm.c
> > +++ b/target-i386/kvm.c
> > @@ -302,6 +302,16 @@ void kvm_inject_x86_mce(CPUState *cenv, int bank, uint64_t status,
> >
> > static int _kvm_arch_init_vcpu(CPUState *env);
> >
> > +static void cpu_update_state(void *opaque, int running, int reason)
> > +{
> > + CPUState *env = opaque;
> > +
> > + if (!running) {
> > + env->update_tsc = 1;
> > + }
> > +}
> > +
> > +
>
> Additional blank line.
>
> > int kvm_arch_init_vcpu(CPUState *env)
> > {
> > int r;
> > @@ -444,6 +454,8 @@ int kvm_arch_init_vcpu(CPUState *env)
> > }
> > #endif
> >
> > + qemu_add_vm_change_state_handler(cpu_update_state, env);
> > +
> > return kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data);
> > }
> >
> > @@ -1093,7 +1105,12 @@ static int kvm_get_msrs(CPUState *env)
> > msrs[n++].index = MSR_STAR;
> > if (kvm_has_msr_hsave_pa(env))
> > msrs[n++].index = MSR_VM_HSAVE_PA;
> > - msrs[n++].index = MSR_IA32_TSC;
> > +
> > + if (env->update_tsc) {
> > + msrs[n++].index = MSR_IA32_TSC;
> > + env->update_tsc = 0;
> > + }
> > +
> > #ifdef TARGET_X86_64
> > if (lm_capable_kernel) {
> > msrs[n++].index = MSR_CSTAR;
>
> Not quite the logic I'm using for kvmclock:
Ok. I have all the interest in keeping the same logic.
I will respin.
> cpu_update_state()
> if running
> tsc_valid = false;
>
> kvm_get_msrs()
> ...
> if (!tsc_valid)
> read_tsc
> tsc_valid = !vm_running;
>
> That ensure we always read the tsc while the VM is running, and not only
> after it was stopped (might otherwise be "surprising" when once
> visualizing the MSRs).
>
> Jan
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-02 14:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-01 19:17 [Qemu-devel] [PATCH] make tsc stable over migration and machine start Glauber Costa
2011-02-01 20:26 ` [Qemu-devel] " Jan Kiszka
2011-02-02 12:05 ` Glauber Costa
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).