[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] x86/time: use correct guest TSC frequency in tsc_get_info()
commit 75904ac35f589b420d6d30415a64888b121d6484 Author: Haozhong Zhang <haozhong.zhang@xxxxxxxxx> AuthorDate: Fri Jan 8 10:48:29 2016 +0100 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Fri Jan 8 10:48:29 2016 +0100 x86/time: use correct guest TSC frequency in tsc_get_info() When the TSC mode of a HVM container is TSC_MODE_DEFAULT or TSC_MODE_PVRDTSCP and no TSC emulation is used, the existing tsc_get_info() uses the host TSC frequency (cpu_khz) as the guest TSC frequency. However, tsc_set_info() may set the guest TSC frequency to a value different than the host. In order to keep consistent to tsc_set_info(), this patch makes tsc_get_info() use the value set by tsc_set_info() as the guest TSC frequency. Signed-off-by: Haozhong Zhang <haozhong.zhang@xxxxxxxxx> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx> --- xen/arch/x86/time.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index ee4d755..ec3f33e 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1749,6 +1749,9 @@ void tsc_get_info(struct domain *d, uint32_t *tsc_mode, uint64_t *elapsed_nsec, uint32_t *gtsc_khz, uint32_t *incarnation) { + bool_t enable_tsc_scaling = has_hvm_container_domain(d) && + cpu_has_tsc_ratio && !d->arch.vtsc; + *incarnation = d->arch.incarnation; *tsc_mode = d->arch.tsc_mode; @@ -1769,7 +1772,7 @@ void tsc_get_info(struct domain *d, uint32_t *tsc_mode, } tsc = rdtsc(); *elapsed_nsec = scale_delta(tsc, &d->arch.vtsc_to_ns); - *gtsc_khz = cpu_khz; + *gtsc_khz = enable_tsc_scaling ? d->arch.tsc_khz : cpu_khz; break; case TSC_MODE_PVRDTSCP: if ( d->arch.vtsc ) @@ -1780,9 +1783,10 @@ void tsc_get_info(struct domain *d, uint32_t *tsc_mode, else { tsc = rdtsc(); - *elapsed_nsec = scale_delta(tsc, &d->arch.vtsc_to_ns) - + *elapsed_nsec = scale_delta(tsc, &this_cpu(cpu_time).tsc_scale) - d->arch.vtsc_offset; - *gtsc_khz = 0; /* ignored by tsc_set_info */ + *gtsc_khz = enable_tsc_scaling ? d->arch.tsc_khz + : 0 /* ignored by tsc_set_info */; } break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |