From patchwork Tue Jul 13 02:08:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zachary Amsden X-Patchwork-Id: 111598 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6D2B8V3012382 for ; Tue, 13 Jul 2010 02:11:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756726Ab0GMCKX (ORCPT ); Mon, 12 Jul 2010 22:10:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15556 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756704Ab0GMCJd (ORCPT ); Mon, 12 Jul 2010 22:09:33 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6D29Xjb016357 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Jul 2010 22:09:33 -0400 Received: from mysore (vpn-10-168.rdu.redhat.com [10.11.10.168]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6D28R2I020904; Mon, 12 Jul 2010 22:09:31 -0400 From: Zachary Amsden To: KVM , Avi Kivity , Marcelo Tosatti , Glauber Costa Cc: Linux-kernel , Zachary Amsden Subject: [PATCH 16/18] Use getnsboottime in KVM Date: Mon, 12 Jul 2010 16:08:10 -1000 Message-Id: <1278986892-11733-17-git-send-email-zamsden@redhat.com> In-Reply-To: <1278986892-11733-1-git-send-email-zamsden@redhat.com> References: <1278986892-11733-1-git-send-email-zamsden@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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]); Tue, 13 Jul 2010 02:11:10 +0000 (UTC) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 7b9fdf3..c55cdf9 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -891,16 +891,6 @@ static void kvm_set_time_scale(uint32_t tsc_khz, struct pvclock_vcpu_time_info * hv_clock->tsc_to_system_mul); } -static inline u64 get_kernel_ns(void) -{ - struct timespec ts; - - WARN_ON(preemptible()); - ktime_get_ts(&ts); - monotonic_to_bootbased(&ts); - return timespec_to_ns(&ts); -} - static DEFINE_PER_CPU(unsigned long, cpu_tsc_khz); static inline int kvm_tsc_changes_freq(void) @@ -929,7 +919,7 @@ void guest_write_tsc(struct kvm_vcpu *vcpu, u64 data) spin_lock(&kvm->arch.tsc_write_lock); offset = data - native_read_tsc(); - ns = get_kernel_ns(); + ns = getnsboottime(); elapsed = ns - kvm->arch.last_tsc_nsec; sdiff = data - kvm->arch.last_tsc_write; if (sdiff < 0) @@ -982,7 +972,7 @@ static int kvm_write_guest_time(struct kvm_vcpu *v) /* Keep irq disabled to prevent changes to the clock */ local_irq_save(flags); kvm_get_msr(v, MSR_IA32_TSC, &tsc_timestamp); - kernel_ns = get_kernel_ns(); + kernel_ns = getnsboottime(); this_tsc_khz = __get_cpu_var(cpu_tsc_khz); local_irq_restore(flags); @@ -1927,7 +1917,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) if (check_tsc_unstable()) { /* Subtract elapsed cycle time */ u64 ns = !vcpu->arch.last_host_ns ? 0 : - get_kernel_ns() - vcpu->arch.last_host_ns; + getnsboottime() - vcpu->arch.last_host_ns; tsc_delta -= nsec_to_cycles(ns); kvm_x86_ops->adjust_tsc_offset(vcpu, -tsc_delta); } @@ -1942,7 +1932,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) kvm_x86_ops->vcpu_put(vcpu); kvm_put_guest_fpu(vcpu); vcpu->arch.last_host_tsc = native_read_tsc(); - vcpu->arch.last_host_ns = get_kernel_ns(); + vcpu->arch.last_host_ns = getnsboottime(); } static int is_efer_nx(void) @@ -3335,7 +3325,7 @@ long kvm_arch_vm_ioctl(struct file *filp, goto out; r = 0; - now_ns = get_kernel_ns(); + now_ns = getnsboottime(); delta = user_ns.clock - now_ns; kvm->arch.kvmclock_offset = delta; break; @@ -3344,7 +3334,7 @@ long kvm_arch_vm_ioctl(struct file *filp, struct kvm_clock_data user_ns; u64 now_ns; - now_ns = get_kernel_ns(); + now_ns = getnsboottime(); user_ns.clock = kvm->arch.kvmclock_offset + now_ns; user_ns.flags = 0;