diff mbox series

[v1,04/23] KVM: x86: Mark CR4.FRED as not reserved

Message ID	20231108183003.5981-5-xin3.li@intel.com (mailing list archive)
State	New, archived
Headers	show Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACF0C32C82; Wed, 8 Nov 2023 19:00:27 +0000 (UTC) From: Xin Li <xin3.li@intel.com> To: kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: seanjc@google.com, pbonzini@redhat.com, corbet@lwn.net, kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, vkuznets@redhat.com, peterz@infradead.org, ravi.v.shankar@intel.com Subject: [PATCH v1 04/23] KVM: x86: Mark CR4.FRED as not reserved Date: Wed, 8 Nov 2023 10:29:44 -0800 Message-ID: <20231108183003.5981-5-xin3.li@intel.com> In-Reply-To: <20231108183003.5981-1-xin3.li@intel.com> References: <20231108183003.5981-1-xin3.li@intel.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	Enable FRED with KVM VMX \| expand [v1,00/23] Enable FRED with KVM VMX [v1,01/23] KVM: VMX: Cleanup VMX basic information defines and usages [v1,02/23] KVM: VMX: Cleanup VMX misc information defines and usages [v1,03/23] KVM: VMX: Add support for the secondary VM exit controls [v1,04/23] KVM: x86: Mark CR4.FRED as not reserved [v1,05/23] KVM: VMX: Initialize FRED VM entry/exit controls in vmcs_config [v1,06/23] KVM: VMX: Defer enabling FRED MSRs save/load until after set CPUID [v1,07/23] KVM: VMX: Disable intercepting FRED MSRs [v1,08/23] KVM: VMX: Initialize VMCS FRED fields [v1,09/23] KVM: VMX: Switch FRED RSP0 between host and guest [v1,10/23] KVM: VMX: Add support for FRED context save/restore [v1,11/23] KVM: x86: Add kvm_is_fred_enabled() [v1,12/23] KVM: VMX: Handle FRED event data [v1,13/23] KVM: VMX: Handle VMX nested exception for FRED [v1,14/23] KVM: VMX: Dump FRED context in dump_vmcs() [v1,15/23] KVM: nVMX: Add support for the secondary VM exit controls [v1,16/23] KVM: nVMX: Add FRED VMCS fields [v1,17/23] KVM: nVMX: Add support for VMX FRED controls [v1,18/23] KVM: nVMX: Add VMCS FRED states checking [v1,19/23] KVM: x86: Allow FRED/LKGS/WRMSRNS to be exposed to guests [v1,20/23] KVM: selftests: Add FRED VMCS fields to evmcs [v1,21/23] KVM: selftests: Run debug_regs test with FRED enabled [v1,22/23] KVM: selftests: Add a new VM guest mode to run user level code [v1,23/23] KVM: selftests: Add fred exception tests

Commit Message

Li, Xin3 Nov. 8, 2023, 6:29 p.m. UTC

The CR4.FRED bit, i.e., CR4[32], is no longer a reserved bit when a guest
enumerates FRED, otherwise it is still a reserved bit.

Tested-by: Shan Kang <shan.kang@intel.com>
Signed-off-by: Xin Li <xin3.li@intel.com>
---
 arch/x86/include/asm/kvm_host.h | 3 ++-
 arch/x86/kvm/x86.h              | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index d7036982332e..1e5a6d9439f8 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -133,7 +133,8 @@ 
 			  | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR | X86_CR4_PCIDE \
 			  | X86_CR4_OSXSAVE | X86_CR4_SMEP | X86_CR4_FSGSBASE \
 			  | X86_CR4_OSXMMEXCPT | X86_CR4_LA57 | X86_CR4_VMXE \
-			  | X86_CR4_SMAP | X86_CR4_PKE | X86_CR4_UMIP))
+			  | X86_CR4_SMAP | X86_CR4_PKE | X86_CR4_UMIP \
+			  | X86_CR4_FRED))
 
 #define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)
 
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index 5184fde1dc54..60da8cbe6759 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -530,6 +530,8 @@  bool kvm_msr_allowed(struct kvm_vcpu *vcpu, u32 index, u32 type);
 		__reserved_bits |= X86_CR4_VMXE;        \
 	if (!__cpu_has(__c, X86_FEATURE_PCID))          \
 		__reserved_bits |= X86_CR4_PCIDE;       \
+	if (!__cpu_has(__c, X86_FEATURE_FRED))          \
+		__reserved_bits |= X86_CR4_FRED;        \
 	__reserved_bits;                                \
 })