From nobody Wed Dec 31 06:41:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECE20C4332F for ; Tue, 7 Nov 2023 15:31:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343991AbjKGPbW (ORCPT ); Tue, 7 Nov 2023 10:31:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343825AbjKGPbF (ORCPT ); Tue, 7 Nov 2023 10:31:05 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 948486185; Tue, 7 Nov 2023 07:01:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699369321; x=1730905321; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nihhIarrSA6BKvrEupadPmJQ5aVN4hKrrazCKaag7KE=; b=jwdtHHcvVT5tiRUGElTUF1yDoWN9dB9ZIv81it3n0D3YASxMZl1/Sjci 4isbfBW56m6MgOGo1XU+DCm00ejJTng0QZQFJAwzRP46hAv8FeRufkB6J RXgaUZRBmsosFG65yd/ixfAI7xYsMF3Wl6FcXCoWwFZk5jU7sN8/8qhen j2L1PCa4vRMNdWS/NTngWN1poD5YRiScQXH+7dFY3Zx999RtYWZAWGMuV XCWSBGSevI+D+CqdVh1TnKsnK3uy2zzK+2LQwe8FyL/x+1aTyeT1meGKm oEWFgFBBjN/4ojnSa+ruR2eoc/SfhaazK9tGwBn3ujUxnIz1oblSF0LvP Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10887"; a="2462660" X-IronPort-AV: E=Sophos;i="6.03,284,1694761200"; d="scan'208";a="2462660" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 06:58:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,284,1694761200"; d="scan'208";a="10851645" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 06:58:28 -0800 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 , erdemaktas@google.com, Sean Christopherson , Sagi Shahar , David Matlack , Kai Huang , Zhi Wang , chen.bo@intel.com, hang.yuan@intel.com, tina.zhang@intel.com Subject: [PATCH v17 107/116] KVM: TDX: Ignore setting up mce Date: Tue, 7 Nov 2023 06:57:13 -0800 Message-Id: <0ac069bc39e37de9a3d0cdf3e63049eaab3e1542.1699368322.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata 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 --- arch/x86/kvm/vmx/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c index 6c4afb524fe7..239723e46d2e 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 =20 +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 =3D { .cancel_hv_timer =3D vt_cancel_hv_timer, #endif =20 - .setup_mce =3D vmx_setup_mce, + .setup_mce =3D vt_setup_mce, =20 #ifdef CONFIG_KVM_SMM .smi_allowed =3D vt_smi_allowed, --=20 2.25.1