From owner-svn-src-projects@FreeBSD.ORG Wed Dec 31 06:59:24 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22A7F3E8; Wed, 31 Dec 2014 06:59:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 04FD336F3; Wed, 31 Dec 2014 06:59:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBV6xN71061095; Wed, 31 Dec 2014 06:59:23 GMT (envelope-from bryanv@FreeBSD.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBV6xNPj061088; Wed, 31 Dec 2014 06:59:23 GMT (envelope-from bryanv@FreeBSD.org) Message-Id: <201412310659.sBV6xNPj061088@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bryanv set sender to bryanv@FreeBSD.org using -f From: Bryan Venteicher Date: Wed, 31 Dec 2014 06:59:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276454 - in projects/paravirt/sys/x86: include x86 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Dec 2014 06:59:24 -0000 Author: bryanv Date: Wed Dec 31 06:59:22 2014 New Revision: 276454 URL: https://svnweb.freebsd.org/changeset/base/276454 Log: Add code to calculate the TSC frequency from the KVM/PV clock Not currently used. Could later be used similarly to the VMware code to avoid attempting to calibrate the TSC. Modified: projects/paravirt/sys/x86/include/kvm.h projects/paravirt/sys/x86/include/pvclock.h projects/paravirt/sys/x86/x86/kvm_clock.c projects/paravirt/sys/x86/x86/pvclock.c Modified: projects/paravirt/sys/x86/include/kvm.h ============================================================================== --- projects/paravirt/sys/x86/include/kvm.h Wed Dec 31 06:54:28 2014 (r276453) +++ projects/paravirt/sys/x86/include/kvm.h Wed Dec 31 06:59:22 2014 (r276454) @@ -43,5 +43,6 @@ int kvm_paravirt_supported(void); uint32_t kvm_get_features(void); +uint64_t kvm_clock_tsc_freq(void); #endif /* !_X86_KVM_H_ */ Modified: projects/paravirt/sys/x86/include/pvclock.h ============================================================================== --- projects/paravirt/sys/x86/include/pvclock.h Wed Dec 31 06:54:28 2014 (r276453) +++ projects/paravirt/sys/x86/include/pvclock.h Wed Dec 31 06:59:22 2014 (r276454) @@ -50,6 +50,7 @@ struct pvclock_wall_clock { } __packed; void pvclock_resume(void); +uint64_t pvclock_tsc_freq(struct pvclock_vcpu_time_info *ti); uint64_t pvclock_get_timecount(struct pvclock_vcpu_time_info *ti); void pvclock_get_wallclock(struct pvclock_wall_clock *wc, struct timespec *ts); Modified: projects/paravirt/sys/x86/x86/kvm_clock.c ============================================================================== --- projects/paravirt/sys/x86/x86/kvm_clock.c Wed Dec 31 06:54:28 2014 (r276453) +++ projects/paravirt/sys/x86/x86/kvm_clock.c Wed Dec 31 06:59:22 2014 (r276454) @@ -58,6 +58,20 @@ static struct timecounter kvm_clock_time static uint32_t kvm_clock_wall_clock_msr; static uint32_t kvm_clock_system_time_msr; +uint64_t +kvm_clock_tsc_freq(void) +{ + struct pvclock_vcpu_time_info *ti; + uint64_t freq; + + critical_enter(); + ti = DPCPU_PTR(kvm_clock_vcpu_time_info); + freq = pvclock_tsc_freq(ti); + critical_exit(); + + return (freq); +} + static u_int kvm_clock_get_timecounter(struct timecounter *tc) { Modified: projects/paravirt/sys/x86/x86/pvclock.c ============================================================================== --- projects/paravirt/sys/x86/x86/pvclock.c Wed Dec 31 06:54:28 2014 (r276453) +++ projects/paravirt/sys/x86/x86/pvclock.c Wed Dec 31 06:59:22 2014 (r276454) @@ -50,6 +50,21 @@ pvclock_resume(void) atomic_store_rel_64(&pvclock_last_cycles, 0); } +uint64_t +pvclock_tsc_freq(struct pvclock_vcpu_time_info *ti) +{ + uint64_t freq; + + freq = (1000000000ULL << 32) / ti->tsc_to_system_mul; + + if (ti->tsc_shift < 0) + freq <<= -ti->tsc_shift; + else + freq >>= ti->tsc_shift; + + return (freq); +} + /* * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction, * yielding a 64-bit result.