Date: Thu, 4 Apr 2019 02:05:51 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r345867 - in stable/12/sys/cddl/dev/dtrace: amd64 i386 Message-ID: <201904040205.x3425pxY045334@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Thu Apr 4 02:05:50 2019 New Revision: 345867 URL: https://svnweb.freebsd.org/changeset/base/345867 Log: MFC r345359, r345384: Don't attempt to measure TSC skew when running as a VM guest. PR: 218452 Modified: stable/12/sys/cddl/dev/dtrace/amd64/dtrace_subr.c stable/12/sys/cddl/dev/dtrace/i386/dtrace_subr.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cddl/dev/dtrace/amd64/dtrace_subr.c ============================================================================== --- stable/12/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Apr 4 01:23:06 2019 (r345866) +++ stable/12/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Apr 4 02:05:50 2019 (r345867) @@ -319,6 +319,9 @@ dtrace_gethrtime_init(void *arg) int i; #endif + if (vm_guest != VM_GUEST_NO) + return; + /* The current CPU is the reference one. */ sched_pin(); tsc_skew[curcpu] = 0; Modified: stable/12/sys/cddl/dev/dtrace/i386/dtrace_subr.c ============================================================================== --- stable/12/sys/cddl/dev/dtrace/i386/dtrace_subr.c Thu Apr 4 01:23:06 2019 (r345866) +++ stable/12/sys/cddl/dev/dtrace/i386/dtrace_subr.c Thu Apr 4 02:05:50 2019 (r345867) @@ -321,6 +321,9 @@ dtrace_gethrtime_init(void *arg) int i; #endif + if (vm_guest != VM_GUEST_NO) + return; + /* The current CPU is the reference one. */ sched_pin(); tsc_skew[curcpu] = 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904040205.x3425pxY045334>