From nobody Thu Oct 27 17:56:39 2022 X-Original-To: dev-commits-src-all@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 4MytfH44Txz4gf2X; Thu, 27 Oct 2022 17:56:39 +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 4MytfH3KCJz41Yp; Thu, 27 Oct 2022 17:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666893399; 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=9qVIq2XHIpHM6OS0J+ehcDiJ20oP2SG21WIqpnmuFGM=; b=BShBe1slJ4aYAPPczqczFoCZ5Nd8DRp7k3YzNLYuEh95157x8zCBeWodROTLXjFZdxz6Zv Y/JhZcQnhDR6/JlJ59GUyFgVuGjJJ3fqC6il4oiR67OdonHP1damKe1wehfEAGag3H64dn cYIdrUg0jN4ilM44U3KPc1Z92slmbJUlyqcA7ibQUPaMu2BFK+wudrognUy04Wn+Aw8QsU kAWDxYNs6xUymB5eQYiesLbIrFUq9F8zxbTTMnGZsL5SIqIcj/MKXRSV+Lr/4mYHXvbl48 nB1Pf0OEL/SePyxBfyPuaJWeYIFIrr2sfdc1WwzM+d65pPCzs7I6XyUY3KOtEw== 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 4MytfH2G0Rz16Mq; Thu, 27 Oct 2022 17:56:39 +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 29RHud8l018669; Thu, 27 Oct 2022 17:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29RHudpi018668; Thu, 27 Oct 2022 17:56:39 GMT (envelope-from git) Date: Thu, 27 Oct 2022 17:56:39 GMT Message-Id: <202210271756.29RHudpi018668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1d21f6414922 - main - bhyve: Implement MSR_MISC_FEATURES_ENABLES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d21f64149224000d74e0c850686e85aefd25ef9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666893399; 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=9qVIq2XHIpHM6OS0J+ehcDiJ20oP2SG21WIqpnmuFGM=; b=e2wU9f+eJw/yoP8tWdyWW1L6qpK621pudqa8TBTWebDpcA0X4oVI1Kynv5mAUHSy64AM02 OxmI+Jr2OarEams61fPontt8L+uyvJz8aXwn+mfkW9Q6H9prdFwBkb01vN8XMxa3hNYtgn fsKl2qoPeVvMvIsJYr+DC8sD2FHxGbCYEaKHWeIFqowLD3uzsfmd2zJ/8HfFpKtIioGfPZ R24qZyw3ULcvlFg9xQzAaGf5uMRqSCmfraggb9u/7yjLv+vbowSUzEJtewOSXpsjheRPJT 0JILe6ibA1TwMte8Yq42vdgs17+U2FX4piGDkqwfwRkq/PxfNIp1d6nDI7aC4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666893399; a=rsa-sha256; cv=none; b=trO1gerG+Ges+dJCwYHP1qi/1pcf8pVnlvPBzTJV28Vru8mUjpNKqPyIcsKClLi+xqqldn Y+mwXnUO1A2kD+vCfQ6Ac9I618pMb140g2p5Q4E0LdYZa4Nt9kcQbWjmVqVQE/aNmAQBS5 rVSUxyNjA3eK6l2f1S1hwW0+S9lqWVBOahqNgMVdTb+cj6BoauF5jftZdgcDQ3aLjtKl77 qYd8hXgl9BHVMXC/uouyP8nl9zGoxcABfF7ijPm3dzyTtRhaiaUQ+npZiD+n+FTt7uUvWQ j3ypL7An07qLr8gaP8EzXWjBbXmey1pltJgWBWcpFyE4SPlXMaUFIMetK7Kl2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d21f64149224000d74e0c850686e85aefd25ef9 commit 1d21f64149224000d74e0c850686e85aefd25ef9 Author: Warner Losh AuthorDate: 2022-10-27 17:32:18 +0000 Commit: Warner Losh CommitDate: 2022-10-27 17:34:41 +0000 bhyve: Implement MSR_MISC_FEATURES_ENABLES Linux reads MISC_FEATURES_ENABLES to manage the CPUID faulting feature (undocumented in the Intel SDM, but documented in 323850-004 (Intel Virtualization Technology FlexMigration Application Note). Since bhyve doesn't emulate this feature, we always return 0. Neither does bhyve support the MONITOR/MWAIT fault bit also in this MSR (which is documented in the sdm), so always return 0. Sponsored by: Netflix Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D36602 --- sys/x86/include/specialreg.h | 1 + usr.sbin/bhyve/xmsr.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index ddac2b9ea2b2..0185317dbd38 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -559,6 +559,7 @@ #define MSR_BBL_CR_CTL3 0x11e #define MSR_IA32_TSX_CTRL 0x122 #define MSR_IA32_MCU_OPT_CTRL 0x123 +#define MSR_MISC_FEATURE_ENABLES 0x140 #define MSR_SYSENTER_CS_MSR 0x174 #define MSR_SYSENTER_ESP_MSR 0x175 #define MSR_SYSENTER_EIP_MSR 0x176 diff --git a/usr.sbin/bhyve/xmsr.c b/usr.sbin/bhyve/xmsr.c index 563743dd05b4..5f735152e92c 100644 --- a/usr.sbin/bhyve/xmsr.c +++ b/usr.sbin/bhyve/xmsr.c @@ -117,6 +117,7 @@ emulate_rdmsr(struct vmctx *ctx __unused, int vcpu __unused, uint32_t num, case MSR_PP0_ENERGY_STATUS: case MSR_PP1_ENERGY_STATUS: case MSR_DRAM_ENERGY_STATUS: + case MSR_MISC_FEATURE_ENABLES: *val = 0; break; case MSR_RAPL_POWER_UNIT: