From nobody Fri Feb 11 06:52:07 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F1F1619C80AD; Fri, 11 Feb 2022 06:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jw46b5Qwsz4sGh; Fri, 11 Feb 2022 06:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644562327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNE8Cx7I2TVY93TlbTu9GmoP5CeZMDi7X1dB8uiBG6E=; b=JMavESnD3rpHfVvEZdFiFHZ9ig9OHFI5xwwcVDOUrUVXWsK34MDjKsrcF1z1+f3It8X0BO pnzg1r+kvRQ+CE6+ytHFIqW4rHT4iWaR32OiaYkSAmlY7xrUwIyBTuAHo9YNKjhlpN0lgB vgTPH753FV2FvPMZ+Ve29sqPSUFio9VyOd1bXe1/JrBoJ5YM9vbSS79ASoO1vPlFDPgEyI GOwEdRSQyTDt/CNnfe9dCfo/NdwauSCpJEzVgEydRBisBU8CJNXKETpKwfIuRIgVDYdQj6 C+eS2LVwjMlrDmbFyW1NW0/NPf169hYG7Md7gLkoR88UeAPSc8gLyLfK9msfKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 901767A84; Fri, 11 Feb 2022 06:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21B6q7XM031182; Fri, 11 Feb 2022 06:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21B6q7Ih031181; Fri, 11 Feb 2022 06:52:07 GMT (envelope-from git) Date: Fri, 11 Feb 2022 06:52:07 GMT Message-Id: <202202110652.21B6q7Ih031181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: eb28df303b06 - stable/13 - Detect CPU type before asking VMWare for TSC freq List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb28df303b068c5db94943c9858e359975f7fa74 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644562327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNE8Cx7I2TVY93TlbTu9GmoP5CeZMDi7X1dB8uiBG6E=; b=c/3m93/dvnTT1/Ej+Rk4oG2vvBat3q9PMq7WJgSjJJ/0snko0mH1BI+NIacULJ+QfYrUPd c+3zc7/qUxfF9PKhUZL88pzqXGFKh3073JuVvsJAwoy2GD4Hdc1/RZylepbFRylgfyACvX hyfxuS69jaacGDIbu8nEm0RllsA+HMCf6AjbMXtbjeH9ye9onQxtdyHODJ7yPRah/7ts1m Id95saa5zUI99QFaCKNDh/alPeRJvrKr3VR4+3j2wrS6WfoDfDiMhpafnS6WJ2yCaLQ4p+ KE3Vw9ZeqcFaPGtBl7S7GmPpnyaF5z2gdqFVFPiRxlDSDrrkmLhIuyFj8ikVXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644562327; a=rsa-sha256; cv=none; b=WGkViXz4L38LUuLDNOuyr+RHqTaxDVhqZQagRO1k4ZnKiOtIwsTz1DtcrbKhi38rgbg84U 7F7TDk34SR2i91THsO4BIolECltZKJw0+ZFgls3xajBMIJJ+IFyIEbrz+ri3XhfD7ft3By DRkA4/NgOqioKW1rR+G7irz7N084Dwc0SLMVWUM7w+VBW2/9+sjIIyZRSCpMhCIVyDirYd Jz1Ocs2q6gXa+ClGJcYO/LozGG4ssTwBulVSA8CiodEOLUic3vxpJpoxh8u9zYU7zNRBsr uH3ReQJV2fmyRdEDz/puBe+r2axiTfNwBwX0FdHoOd0F2XSpHyg9Wc8TQ7kV5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eb28df303b068c5db94943c9858e359975f7fa74 commit eb28df303b068c5db94943c9858e359975f7fa74 Author: Colin Percival AuthorDate: 2022-01-04 07:00:39 +0000 Commit: Colin Percival CommitDate: 2022-02-11 06:52:00 +0000 Detect CPU type before asking VMWare for TSC freq This allows us to set tsc_is_invariant and select appropriately fenced versions of RDTSC based on the CPU type. Reviewed by: markj Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit fd980feb574d0924918b42cd449cedf557dfb9e0) --- sys/x86/x86/tsc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c index 1e63c313c7e4..1b6c8282e44e 100644 --- a/sys/x86/x86/tsc.c +++ b/sys/x86/x86/tsc.c @@ -134,7 +134,6 @@ tsc_freq_vmware(void) if (regs[1] != UINT_MAX) tsc_freq = regs[0] | ((uint64_t)regs[1] << 32); } - tsc_is_invariant = 1; tsc_early_calib_exact = 1; } @@ -268,11 +267,6 @@ probe_tsc_freq(void) tsc_perf_stat = 1; } - if (vm_guest == VM_GUEST_VMWARE) { - tsc_freq_vmware(); - return; - } - switch (cpu_vendor_id) { case CPU_VENDOR_AMD: case CPU_VENDOR_HYGON: @@ -311,6 +305,11 @@ probe_tsc_freq(void) break; } + if (vm_guest == VM_GUEST_VMWARE) { + tsc_freq_vmware(); + return; + } + if (tsc_freq_cpuid(&tsc_freq)) { /* * If possible, use the value obtained from CPUID as the initial