diff mbox series

[v16,107/116] KVM: TDX: Ignore setting up mce

Message ID	2f26eae805dea844d5ba513e2c1bb9b9a7c6554b.1697471314.git.isaku.yamahata@intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@vger.kernel.org> From: isaku.yamahata@intel.com To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: isaku.yamahata@intel.com, isaku.yamahata@gmail.com, Paolo Bonzini <pbonzini@redhat.com>, erdemaktas@google.com, Sean Christopherson <seanjc@google.com>, Sagi Shahar <sagis@google.com>, David Matlack <dmatlack@google.com>, Kai Huang <kai.huang@intel.com>, Zhi Wang <zhi.wang.linux@gmail.com>, chen.bo@intel.com, hang.yuan@intel.com, tina.zhang@intel.com Subject: [PATCH v16 107/116] KVM: TDX: Ignore setting up mce Date: Mon, 16 Oct 2023 09:14:59 -0700 Message-Id: <2f26eae805dea844d5ba513e2c1bb9b9a7c6554b.1697471314.git.isaku.yamahata@intel.com> In-Reply-To: <cover.1697471314.git.isaku.yamahata@intel.com> References: <cover.1697471314.git.isaku.yamahata@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	KVM TDX basic feature support \| expand [v16,000/116] KVM TDX basic feature support [v16,001/116] KVM: VMX: Move out vmx_x86_ops to 'main.c' to wrap VMX and TDX [v16,002/116] KVM: x86/vmx: initialize loaded_vmcss_on_cpu in vmx_hardware_setup() [v16,003/116] KVM: x86/vmx: Refactor KVM VMX module init/exit functions [v16,004/116] KVM: VMX: Reorder vmx initialization with kvm vendor initialization [v16,005/116] KVM: TDX: Initialize the TDX module when loading the KVM intel kernel module [v16,006/116] KVM: TDX: Add placeholders for TDX VM/vcpu structure [v16,007/116] KVM: TDX: Make TDX VM type supported [v16,008/116,MARKER] The start of TDX KVM patch series: TDX architectural definitions [v16,009/116] KVM: TDX: Define TDX architectural definitions [v16,010/116] KVM: TDX: Add TDX "architectural" error codes [v16,011/116] KVM: TDX: Add C wrapper functions for SEAMCALLs to the TDX module [v16,012/116] KVM: TDX: Retry SEAMCALL on the lack of entropy error [v16,013/116] KVM: TDX: Add helper functions to print TDX SEAMCALL error [v16,014/116,MARKER] The start of TDX KVM patch series: TD VM creation/destruction [v16,015/116] x86/cpu: Add helper functions to allocate/free TDX private host key id [v16,016/116] x86/virt/tdx: Add a helper function to return system wide info about TDX module [v16,017/116] KVM: TDX: Add place holder for TDX VM specific mem_enc_op ioctl [v16,018/116] KVM: TDX: x86: Add ioctl to get TDX systemwide parameters [v16,019/116] KVM: x86, tdx: Make KVM_CAP_MAX_VCPUS backend specific [v16,020/116] KVM: TDX: create/destroy VM structure [v16,021/116] KVM: TDX: initialize VM with TDX specific parameters [v16,022/116] KVM: TDX: Make pmu_intel.c ignore guest TD case [v16,023/116] KVM: TDX: Refuse to unplug the last cpu on the package [v16,024/116,MARKER] The start of TDX KVM patch series: TD vcpu creation/destruction [v16,025/116] KVM: TDX: allocate/free TDX vcpu structure [v16,026/116] KVM: TDX: Do TDX specific vcpu initialization [v16,027/116,MARKER] The start of TDX KVM patch series: KVM MMU GPA shared bits [v16,028/116] KVM: x86/mmu: introduce config for PRIVATE KVM MMU [v16,029/116] KVM: x86/mmu: Add address conversion functions for TDX shared bit of GPA [v16,030/116,MARKER] The start of TDX KVM patch series: KVM TDP refactoring for TDX [v16,031/116] KVM: Allow page-sized MMU caches to be initialized with custom 64-bit values [v16,032/116] KVM: x86/mmu: Replace hardcoded value 0 for the initial value for SPTE [v16,033/116] KVM: x86/mmu: Allow non-zero value for non-present SPTE and removed SPTE [v16,034/116] KVM: x86/mmu: Add Suppress VE bit to shadow_mmio_mask/shadow_present_mask [v16,035/116] KVM: x86/mmu: Track shadow MMIO value on a per-VM basis [v16,036/116] KVM: x86/mmu: Disallow fast page fault on private GPA [v16,037/116] KVM: x86/mmu: Allow per-VM override of the TDP max page level [v16,038/116] KVM: VMX: Introduce test mode related to EPT violation VE [v16,039/116,MARKER] The start of TDX KVM patch series: KVM TDP MMU hooks [v16,040/116] KVM: x86/mmu: Assume guest MMIOs are shared [v16,041/116] KVM: x86/tdp_mmu: Init role member of struct kvm_mmu_page at allocation [v16,042/116] KVM: x86/mmu: Add a new is_private member for union kvm_mmu_page_role [v16,043/116] KVM: x86/mmu: Add a private pointer to struct kvm_mmu_page [v16,044/116] KVM: x86/tdp_mmu: Don't zap private pages for unsupported cases [v16,045/116] KVM: x86/tdp_mmu: Sprinkle __must_check [v16,046/116] KVM: x86/tdp_mmu: Support TDX private mapping for TDP MMU [v16,047/116,MARKER] The start of TDX KVM patch series: TDX EPT violation [v16,048/116] KVM: x86/mmu: TDX: Do not enable page track for TD guest [v16,049/116] KVM: VMX: Split out guts of EPT violation to common/exposed function [v16,050/116] KVM: VMX: Move setting of EPT MMU masks to common VT-x code [v16,051/116] KVM: TDX: Add accessors VMX VMCS helpers [v16,052/116] KVM: TDX: Add load_mmu_pgd method for TDX [v16,053/116] KVM: TDX: Retry seamcall when TDX_OPERAND_BUSY with operand SEPT [v16,054/116] KVM: TDX: Require TDP MMU and mmio caching for TDX [v16,055/116] KVM: TDX: TDP MMU TDX support [v16,056/116] KVM: TDX: MTRR: implement get_mt_mask() for TDX [v16,057/116,MARKER] The start of TDX KVM patch series: TD finalization [v16,058/116] KVM: x86/mmu: Introduce kvm_mmu_map_tdp_page() for use by TDX [v16,059/116] KVM: TDX: Create initial guest memory [v16,060/116] KVM: TDX: Finalize VM initialization [v16,061/116,MARKER] The start of TDX KVM patch series: TD vcpu enter/exit [v16,062/116] KVM: TDX: Implement TDX vcpu enter/exit path [v16,063/116] KVM: TDX: vcpu_run: save/restore host state(host kernel gs) [v16,064/116] KVM: TDX: restore host xsave state when exit from the guest TD [v16,065/116] KVM: x86: Allow to update cached values in kvm_user_return_msrs w/o wrmsr [v16,066/116] KVM: TDX: restore user ret MSRs [v16,067/116] KVM: TDX: Add TSX_CTRL msr into uret_msrs list [v16,068/116,MARKER] The start of TDX KVM patch series: TD vcpu exits/interrupts/hypercalls [v16,069/116] KVM: TDX: complete interrupts after tdexit [v16,070/116] KVM: TDX: restore debug store when TD exit [v16,071/116] KVM: TDX: handle vcpu migration over logical processor [v16,072/116] KVM: x86: Add a switch_db_regs flag to handle TDX's auto-switched behavior [v16,073/116] KVM: TDX: Add support for find pending IRQ in a protected local APIC [v16,074/116] KVM: x86: Assume timer IRQ was injected if APIC state is proteced [v16,075/116] KVM: TDX: remove use of struct vcpu_vmx from posted_interrupt.c [v16,076/116] KVM: TDX: Implement interrupt injection [v16,077/116] KVM: TDX: Implements vcpu request_immediate_exit [v16,078/116] KVM: TDX: Implement methods to inject NMI [v16,079/116] KVM: VMX: Modify NMI and INTR handlers to take intr_info as function argument [v16,080/116] KVM: VMX: Move NMI/exception handler to common helper [v16,081/116] KVM: x86: Split core of hypercall emulation to helper function [v16,082/116] KVM: TDX: Add a place holder to handle TDX VM exit [v16,083/116] KVM: TDX: Handle vmentry failure for INTEL TD guest [v16,084/116] KVM: TDX: handle EXIT_REASON_OTHER_SMI [v16,085/116] KVM: TDX: handle ept violation/misconfig exit [v16,086/116] KVM: TDX: handle EXCEPTION_NMI and EXTERNAL_INTERRUPT [v16,087/116] KVM: TDX: Handle EXIT_REASON_OTHER_SMI with MSMI [v16,088/116] KVM: TDX: Add a place holder for handler of TDX hypercalls (TDG.VP.VMCALL) [v16,089/116] KVM: TDX: handle KVM hypercall with TDG.VP.VMCALL [v16,090/116] KVM: TDX: Add KVM Exit for TDX TDG.VP.VMCALL [v16,091/116] KVM: TDX: Handle TDX PV CPUID hypercall [v16,092/116] KVM: TDX: Handle TDX PV HLT hypercall [v16,093/116] KVM: TDX: Handle TDX PV port io hypercall [v16,094/116] KVM: TDX: Handle TDX PV MMIO hypercall [v16,095/116] KVM: TDX: Implement callbacks for MSR operations for TDX [v16,096/116] KVM: TDX: Handle TDX PV rdmsr/wrmsr hypercall [v16,097/116] KVM: TDX: Handle MSR MTRRCap and MTRRDefType access [v16,098/116] KVM: TDX: Handle MSR IA32_FEAT_CTL MSR and IA32_MCG_EXT_CTL [v16,099/116] KVM: TDX: Handle TDG.VP.VMCALL<GetTdVmCallInfo> hypercall [v16,100/116] KVM: TDX: Silently discard SMI request [v16,101/116] KVM: TDX: Silently ignore INIT/SIPI [v16,102/116] KVM: TDX: Add methods to ignore accesses to CPU state [v16,103/116] KVM: TDX: Add methods to ignore guest instruction emulation [v16,104/116] KVM: TDX: Add a method to ignore dirty logging [v16,105/116] KVM: TDX: Add methods to ignore VMX preemption timer [v16,106/116] KVM: TDX: Add methods to ignore accesses to TSC [v16,107/116] KVM: TDX: Ignore setting up mce [v16,108/116] KVM: TDX: Add a method to ignore for TDX to ignore hypercall patch [v16,109/116] KVM: TDX: Add methods to ignore virtual apic related operation [v16,110/116] KVM: TDX: Inhibit APICv for TDX guest [v16,111/116] Documentation/virt/kvm: Document on Trust Domain Extensions(TDX) [v16,112/116] KVM: x86: design documentation on TDX support of x86 KVM TDP MMU [v16,113/116] KVM: TDX: Add hint TDX ioctl to release Secure-EPT [v16,114/116] RFC: KVM: x86: Add x86 callback to check cpuid [v16,115/116] RFC: KVM: x86, TDX: Add check for KVM_SET_CPUID2 [v16,116/116,MARKER] the end of (the first phase of) TDX KVM patch series

Commit Message

Isaku Yamahata Oct. 16, 2023, 4:14 p.m. UTC

From: Isaku Yamahata <isaku.yamahata@intel.com>

Because vmx_set_mce function is VMX specific and it cannot be used for TDX.
Add vt stub to ignore setting up mce for TDX.

Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
---
 arch/x86/kvm/vmx/main.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c
index d5ee4069f684..df84a12aa232 100644
--- a/arch/x86/kvm/vmx/main.c
+++ b/arch/x86/kvm/vmx/main.c
@@ -908,6 +908,14 @@  static void vt_cancel_hv_timer(struct kvm_vcpu *vcpu)
 }
 #endif
 
+static void vt_setup_mce(struct kvm_vcpu *vcpu)
+{
+	if (is_td_vcpu(vcpu))
+		return;
+
+	vmx_setup_mce(vcpu);
+}
+
 static int vt_mem_enc_ioctl(struct kvm *kvm, void __user *argp)
 {
 	if (!is_td(kvm))
@@ -1063,7 +1071,7 @@  struct kvm_x86_ops vt_x86_ops __initdata = {
 	.cancel_hv_timer = vt_cancel_hv_timer,
 #endif
 
-	.setup_mce = vmx_setup_mce,
+	.setup_mce = vt_setup_mce,
 
 #ifdef CONFIG_KVM_SMM
 	.smi_allowed = vt_smi_allowed,