From nobody Mon Feb 9 06:02:17 2026 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 95230EB64DD for ; Tue, 25 Jul 2023 22:26:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232938AbjGYW0F (ORCPT ); Tue, 25 Jul 2023 18:26:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233263AbjGYWXm (ORCPT ); Tue, 25 Jul 2023 18:23:42 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C648E47; Tue, 25 Jul 2023 15:19:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690323549; x=1721859549; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SygMEPperMXke5HjXl3/l5VxH7fusAvDX6P2uJF8SEo=; b=DPWPZyU5xKH64/kfl300+Ka+JOwEM0hKtbZ0sej6zbNVWlVDkio6yvby CMe1aLCrMCeihnpCRgKEIbfm2KU8IPVlCVm9cMGvyLJP43Bio4fylv216 e+s54QcRXt3z5VfrvENzVfuTgrLx8V/N2q3qfKd+wWJhfmaDCBw8i6Laq 73Yv8HOPXx1FAOdAy7HOnu8PB7E7Mj16TmbhwweqDgfUVGEDGG1xlQ1kE iZ1R3z9UI4IKaWtSGgUuJvbdgCr1OLh3ic72QkNn6VZw+syzLa/FfbHvU DzCpLAKpucL1wme/HH2Wdz/gUPNGlmgd0/3ti1LvGusQKx8kdjQU7VPa4 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10782"; a="367882775" X-IronPort-AV: E=Sophos;i="6.01,231,1684825200"; d="scan'208";a="367882775" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2023 15:16:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10782"; a="840001960" X-IronPort-AV: E=Sophos;i="6.01,231,1684825200"; d="scan'208";a="840001960" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2023 15:16:09 -0700 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 v15 108/115] KVM: TDX: Ignore setting up mce Date: Tue, 25 Jul 2023 15:14:59 -0700 Message-Id: <8816f291483bf3d1ff96cd52d7fc389c49948ec4.1690322424.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 ad74900bbc56..d235268b2a76 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 =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)) @@ -1046,7 +1054,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