From patchwork Sat May 15 02:07:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zachary Amsden X-Patchwork-Id: 99789 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4F27oWD027643 for ; Sat, 15 May 2010 02:07:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752067Ab0EOCHr (ORCPT ); Fri, 14 May 2010 22:07:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17656 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751804Ab0EOCHq (ORCPT ); Fri, 14 May 2010 22:07:46 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4F27jwh017782 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 14 May 2010 22:07:45 -0400 Received: from [10.11.8.20] (vpn-8-20.rdu.redhat.com [10.11.8.20]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4F27hlH031372; Fri, 14 May 2010 22:07:44 -0400 Message-ID: <4BEE01EF.7000506@redhat.com> Date: Fri, 14 May 2010 16:07:43 -1000 From: Zachary Amsden User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: kvm , Avi Kivity , Marcelo Tosatti , Glauber Costa Subject: RFC: kvmclock / tsc server side fix X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 15 May 2010 02:07:51 +0000 (UTC) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 83df4db..ba765fa 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -453,6 +453,8 @@ struct kvm_vcpu_stat { u32 hypercalls; u32 irq_injections; u32 nmi_injections; + u32 tsc_overshoot; + u32 tsc_ahead; }; struct kvm_x86_ops { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index bb44f9e..2bf7e86 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -134,6 +134,8 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { { "insn_emulation_fail", VCPU_STAT(insn_emulation_fail) }, { "irq_injections", VCPU_STAT(irq_injections) }, { "nmi_injections", VCPU_STAT(nmi_injections) }, + { "tsc_overshoot", VCPU_STAT(tsc_overshoot) }, + { "tsc_ahead", VCPU_STAT(tsc_ahead) }, { "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped) }, { "mmu_pte_write", VM_STAT(mmu_pte_write) }, { "mmu_pte_updated", VM_STAT(mmu_pte_updated) }, @@ -849,35 +851,80 @@ static int kvm_recompute_guest_time(struct kvm_vcpu *v) struct kvm_vcpu_arch *vcpu = &v->arch; void *shared_kaddr; unsigned long this_tsc_khz; + s64 kernel_ns, delta; + u64 tsc_timestamp; + bool upscale; if ((!vcpu->time_page)) return 0; - this_tsc_khz = get_cpu_var(cpu_tsc_khz); - put_cpu_var(cpu_tsc_khz); + /* + * The protection we require is simple: we must not be preempted from + * the CPU between our read of the TSC khz and our read of the TSC. + * Interrupt protection is not strictly required, but it does result in + * greater accuracy for the TSC / kernel_ns measurement. + */ + local_irq_save(flags); + this_tsc_khz = __get_cpu_var(cpu_tsc_khz); + kvm_get_msr(v, MSR_IA32_TSC, &tsc_timestamp); + ktime_get_ts(&ts); + monotonic_to_bootbased(&ts); + kernel_ns = timespec_to_ns(&ts); + local_irq_restore(flags); + if (unlikely(this_tsc_khz == 0)) { kvm_request_guest_time_update(v); return 1; } + /* + * Time as measured by the TSC may go backwards when resetting the base + * tsc_timestamp. The reason for this is that the TSC resolution is + * higher than the resolution of the other clock scales. Thus, many + * possible measurments of the TSC correspond to one measurement of any + * other clock, and so a spread of values is possible. This is not a + * problem for the computation of the nanosecond clock; with TSC rates + * around 1GHZ, there can only be a few cycles which correspond to one + * nanosecond value, and any path through this code will inevitably + * take longer than that. However, with the kernel_ns value itself, + * the precision may be much lower, down to HZ granularity. If the + * first sampling of TSC against kernel_ns ends in the low part of the + * range, and the second in the high end of the range, we can get: + * + * (TSC - offset_low) * S + kns_old > (TSC - offset_high) * S + kns_new + * + * As the sampling errors potentially range in the thousands of cycles, + * it is possible such a time value has already been observed by the + * guest. To protect against this, we must compute the system time as + * observed by the guest and ensure the new system time is greater. + */ + delta = native_read_tsc() - vcpu->hv_clock.tsc_timestamp; + delta = pvclock_scale_delta(delta, vcpu->hv_clock.tsc_to_system_mul, + vcpu->hv_clock.tsc_shift); + delta += vcpu->hv_clock.system_time; + if (unlikely(vcpu->hw_tsc_khz != this_tsc_khz)) { + upscale = this_tsc_khz > vcpu->hw_tsc_khz; kvm_get_time_scale(NSEC_PER_SEC / 1000, this_tsc_khz, &vcpu->hv_clock.tsc_shift, &vcpu->hv_clock.tsc_to_system_mul); vcpu->hw_tsc_khz = this_tsc_khz; } - /* Keep irq disabled to prevent changes to the clock */ - local_irq_save(flags); - kvm_get_msr(v, MSR_IA32_TSC, &vcpu->hv_clock.tsc_timestamp); - ktime_get_ts(&ts); - monotonic_to_bootbased(&ts); - local_irq_restore(flags); + if (delta > kernel_ns) { + s64 overshoot = delta - kernel_ns; + ++v->stat.tsc_ahead; + if (upscale) + overshoot = overshoot * 9 / 10; + if (overshoot > 1000ULL * this_tsc_khz / HZ) { + ++v->stat.tsc_overshoot; + } + kernel_ns = delta; + } /* With all the info we got, fill in the values */ - - vcpu->hv_clock.system_time = ts.tv_nsec + - (NSEC_PER_SEC * (u64)ts.tv_sec) + v->kvm->arch.kvmclock_offset; + vcpu->hv_clock.tsc_timestamp = tsc_timestamp; + vcpu->hv_clock.system_time = kernel_ns + v->kvm->arch.kvmclock_offset; /* * The interface expects us to write an even number signaling that the