diff mbox series

[v14,106/113] KVM: TDX: Ignore setting up mce

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

Commit Message

Isaku Yamahata May 29, 2023, 4:20 a.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 166bf274e597..23e6caaa4cfc 100644
--- a/arch/x86/kvm/vmx/main.c
+++ b/arch/x86/kvm/vmx/main.c
@@ -892,6 +892,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))
@@ -1048,7 +1056,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,