diff mbox series

[v2,20/25] KVM: nVMX: Add support for VMX FRED controls

Message ID	20240207172646.3981-21-xin3.li@intel.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel+bounces-56872-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; From: Xin Li <xin3.li@intel.com> To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: seanjc@google.com, pbonzini@redhat.com, corbet@lwn.net, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, shuah@kernel.org, vkuznets@redhat.com, peterz@infradead.org, ravi.v.shankar@intel.com, xin@zytor.com Subject: [PATCH v2 20/25] KVM: nVMX: Add support for VMX FRED controls Date: Wed, 7 Feb 2024 09:26:40 -0800 Message-ID: <20240207172646.3981-21-xin3.li@intel.com> In-Reply-To: <20240207172646.3981-1-xin3.li@intel.com> References: <20240207172646.3981-1-xin3.li@intel.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX
Series	Enable FRED with KVM VMX \| [v2,00/25] Enable FRED with KVM VMX [v2,01/25] KVM: VMX: Cleanup VMX basic information defines and usages [v2,02/25] KVM: VMX: Cleanup VMX misc information defines and usages [v2,03/25] KVM: VMX: Add support for the secondary VM exit controls [v2,04/25] KVM: x86: Mark CR4.FRED as not reserved [v2,05/25] KVM: VMX: Initialize FRED VM entry/exit controls in vmcs_config [v2,06/25] KVM: VMX: Defer enabling FRED MSRs save/load until after set CPUID [v2,07/25] KVM: VMX: Set intercept for FRED MSRs [v2,08/25] KVM: VMX: Initialize VMCS FRED fields [v2,09/25] KVM: VMX: Switch FRED RSP0 between host and guest [v2,10/25] KVM: VMX: Add support for FRED context save/restore [v2,11/25] KVM: x86: Add kvm_is_fred_enabled() [v2,12/25] KVM: VMX: Handle FRED event data [v2,13/25] KVM: VMX: Handle VMX nested exception for FRED [v2,14/25] KVM: VMX: Disable FRED if FRED consistency checks fail [v2,15/25] KVM: VMX: Dump FRED context in dump_vmcs() [v2,16/25] KVM: VMX: Invoke vmx_set_cpu_caps() before nested setup [v2,17/25] KVM: nVMX: Add support for the secondary VM exit controls [v2,18/25] KVM: nVMX: Add a prerequisite to SHADOW_FIELD_R[OW] macros [v2,19/25] KVM: nVMX: Add FRED VMCS fields [v2,20/25] KVM: nVMX: Add support for VMX FRED controls [v2,21/25] KVM: nVMX: Add VMCS FRED states checking [v2,22/25] KVM: x86: Allow FRED/LKGS/WRMSRNS to be exposed to guests [v2,23/25] KVM: selftests: Run debug_regs test with FRED enabled [v2,24/25] KVM: selftests: Add a new VM guest mode to run user level code [v2,25/25] KVM: selftests: Add fred exception tests

Commit Message

Li, Xin3 Feb. 7, 2024, 5:26 p.m. UTC

  Add VMX FRED controls to nested VMX controls and set the VMX
nested-exception support bit (bit 58) in the nested IA32_VMX_BASIC MSR
when FRED is enabled.

Signed-off-by: Xin Li <xin3.li@intel.com>
Tested-by: Shan Kang <shan.kang@intel.com>
---
 arch/x86/kvm/vmx/nested.c | 14 ++++++++++----
 arch/x86/kvm/vmx/vmx.c    |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index f9c1fbeac302..04a9cdb0361f 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -1239,10 +1239,12 @@  static bool is_bitwise_subset(u64 superset, u64 subset, u64 mask)
 #define VMX_BASIC_FEATURES_MASK			\
 	(VMX_BASIC_DUAL_MONITOR_TREATMENT |	\
 	 VMX_BASIC_INOUT |			\
-	 VMX_BASIC_TRUE_CTLS)
+	 VMX_BASIC_TRUE_CTLS |			\
+	 VMX_BASIC_NESTED_EXCEPTION)
 
-#define VMX_BASIC_RESERVED_BITS			\
-	(GENMASK_ULL(63, 56) | GENMASK_ULL(47, 45) | BIT_ULL(31))
+#define VMX_BASIC_RESERVED_BITS				\
+	(GENMASK_ULL(63, 59) | GENMASK_ULL(57, 56) |	\
+	 GENMASK_ULL(47, 45) | BIT_ULL(31))
 
 static int vmx_restore_vmx_basic(struct vcpu_vmx *vmx, u64 data)
 {
@@ -6988,7 +6990,8 @@  static void nested_vmx_setup_entry_ctls(struct vmcs_config *vmcs_conf,
 #ifdef CONFIG_X86_64
 		VM_ENTRY_IA32E_MODE |
 #endif
-		VM_ENTRY_LOAD_IA32_PAT | VM_ENTRY_LOAD_BNDCFGS;
+		VM_ENTRY_LOAD_IA32_PAT | VM_ENTRY_LOAD_BNDCFGS |
+		VM_ENTRY_LOAD_IA32_FRED;
 	msrs->entry_ctls_high |=
 		(VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR | VM_ENTRY_LOAD_IA32_EFER |
 		 VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL);
@@ -7147,6 +7150,9 @@  static void nested_vmx_setup_basic(struct nested_vmx_msrs *msrs)
 
 	if (cpu_has_vmx_basic_inout())
 		msrs->basic |= VMX_BASIC_INOUT;
+
+	if (kvm_cpu_cap_has(X86_FEATURE_FRED))
+		msrs->basic |= VMX_BASIC_NESTED_EXCEPTION;
 }
 
 static void nested_vmx_setup_cr_fixed(struct nested_vmx_msrs *msrs)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index fc808d599493..1005b6a57d23 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -7915,6 +7915,7 @@  static void nested_vmx_cr_fixed1_bits_update(struct kvm_vcpu *vcpu)
 
 	entry = kvm_find_cpuid_entry_index(vcpu, 0x7, 1);
 	cr4_fixed1_update(X86_CR4_LAM_SUP,    eax, feature_bit(LAM));
+	cr4_fixed1_update(X86_CR4_FRED,       eax, feature_bit(FRED));
 
 #undef cr4_fixed1_update
 }