From nobody Thu Jan 26 19:48:04 2023 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 4P2rpt1c8yz3bnXS; Thu, 26 Jan 2023 19:48:06 +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 4P2rpr5Dkdz3DYH; Thu, 26 Jan 2023 19:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762484; 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=pXyD8nA/rfTfyYDHGVrim9PGsszA8dGaS7WX+Hr2b9w=; b=gpRJZgywEUpZS/CGlcglglxsPDp+YScjvrMCSG+7MmXfVAPkNS2rJ+H44Xo0Gl+VbJcXRz b4fQdZqn3K6dVUZZcDkcsQAna78NJTzB/yAeyKdaaM3PaRPKmk3yNqETgtB5HjRH5WGTFf gOChYmNx/ePCIp5NhDfCchwn0QhUjuUW1MJNPSpfZVRu8HK1NbKD8UjxMd8GOI7o0pFzL4 lfIAjIaCz8D50BcWcUplkclr2y/MF1eITjVBT3dAOeAJg7hZB8LF73bFHIam+b6G1/dIpY 49P6UetI0zU7E1TJJHtV0yU0edkMHfy5G8hl3azLAN/hO5/QTFxkWVWhh4HXEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762484; 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=pXyD8nA/rfTfyYDHGVrim9PGsszA8dGaS7WX+Hr2b9w=; b=QS0OaZHVhFSstsTs3uc74rVtgZ8n9sN85nA9rzE/Tz5wIhUxS7JjhvlbTH063W+ykcfC8/ LAVYQuQ/zHVwx81XhQaTwfhMcb/h8f2xTpPPJM/pFyjC2iifXh6TcbTqVquhHkvAsB4lWL 3z+aC6y3xiQaQwCGYf/np5/icTXc4IAAIbJv1PFeCI82tzTjcTvqi6VRZdSpH2Ht48IePD BOn7b/OpWAEMJ29pPEFXThrY965FfMHiAEanP8gmEbXbAoh9OXOn3CHmP28I3ZUKdjz8La SX+dMDSKx23gSEZxe7b3EEGJpfZ3UMS+lRC2fltGGe4JacHQ40LK7c5BJhuINg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674762484; a=rsa-sha256; cv=none; b=og56elHyyiSLrqpiuIz7KSps+FUeEvLQAIHwYveJNrIZbZi4u4BV9JJQ+ov/iNYiRE9ymV RDMNoYVaQHcj4Ho5862OqPFNruGlHz5B5+20mIJc09MfiuzBdnf2/0DIv3t1d+1Kfhlq8Z niKy4ozPpaCA+vKAAjgudX12IbcTWBlKUC3PRUx9tx8jRjKINbz1wAKh8A7o+IlEWabgFf 9AMXAuyBuroFm62NHuhgC3ejgci/3XafcI3K2PiNetLyc1sNm/x4k1hsA1QKTAjjQTTS9e lTIjwKQfoj5laqWKwzyyHgGhvpoq7FJYFbpd/Ax8bxcJ2GcCX8NAPbVkVwIwgQ== 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 4P2rpr4KVGzhMh; Thu, 26 Jan 2023 19:48:04 +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 30QJm4V4007476; Thu, 26 Jan 2023 19:48:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJm4gP007475; Thu, 26 Jan 2023 19:48:04 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:48:04 GMT Message-Id: <202301261948.30QJm4gP007475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 1f1b3763610a - stable/13 - bhyve: Implement MSR_MISC_FEATURES_ENABLES 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1f1b3763610a2e9f58ab50e811f279d8db164e3d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1f1b3763610a2e9f58ab50e811f279d8db164e3d commit 1f1b3763610a2e9f58ab50e811f279d8db164e3d Author: Warner Losh AuthorDate: 2022-10-27 17:32:18 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:43:20 +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 (cherry picked from commit 1d21f64149224000d74e0c850686e85aefd25ef9) --- 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 bc3fd2e563a1..395338b4a4b4 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -564,6 +564,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: