From owner-svn-src-all@FreeBSD.ORG Wed Feb 4 08:33:05 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68A504BE; Wed, 4 Feb 2015 08:33:05 +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 53DC7DD9; Wed, 4 Feb 2015 08:33:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t148X5H2001151; Wed, 4 Feb 2015 08:33:05 GMT (envelope-from bryanv@FreeBSD.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t148X4cJ001146; Wed, 4 Feb 2015 08:33:04 GMT (envelope-from bryanv@FreeBSD.org) Message-Id: <201502040833.t148X4cJ001146@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bryanv set sender to bryanv@FreeBSD.org using -f From: Bryan Venteicher Date: Wed, 4 Feb 2015 08:33:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278184 - in head/sys/x86: include x86 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 08:33:05 -0000 Author: bryanv Date: Wed Feb 4 08:33:04 2015 New Revision: 278184 URL: https://svnweb.freebsd.org/changeset/base/278184 Log: Add interface to derive a TSC frequency from the pvclock This can later use this to determine the TSC frequency like is done with VMware, instead of using a DELAY loop that is not always accurate in an VM. MFC after: 1 month Modified: head/sys/x86/include/pvclock.h head/sys/x86/x86/pvclock.c Modified: head/sys/x86/include/pvclock.h ============================================================================== --- head/sys/x86/include/pvclock.h Wed Feb 4 08:26:43 2015 (r278183) +++ head/sys/x86/include/pvclock.h Wed Feb 4 08:33:04 2015 (r278184) @@ -51,6 +51,7 @@ struct pvclock_wall_clock { void pvclock_resume(void); uint64_t pvclock_get_last_cycles(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: head/sys/x86/x86/pvclock.c ============================================================================== --- head/sys/x86/x86/pvclock.c Wed Feb 4 08:26:43 2015 (r278183) +++ head/sys/x86/x86/pvclock.c Wed Feb 4 08:33:04 2015 (r278184) @@ -58,6 +58,21 @@ pvclock_get_last_cycles(void) return (atomic_load_acq_64(&pvclock_last_cycles)); } +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.