From patchwork Mon Oct 16 16:14:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 13423708 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 6B570CDB465 for ; Mon, 16 Oct 2023 16:32:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234172AbjJPQcM (ORCPT ); Mon, 16 Oct 2023 12:32:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234007AbjJPQbY (ORCPT ); Mon, 16 Oct 2023 12:31:24 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1204D7286; Mon, 16 Oct 2023 09:22:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697473360; x=1729009360; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=E6c9V9MUT82VCy0R4rGt4QE+KOWS8Q3ns5Q31IAK/2k=; b=bCyozLs8IVmXb+2z0v5ZBY9ijvFjtZDhKsAa5xuY+FLZ6Xw+OIHfo+Kd s3WXve8DYz4oL9HEEK+ONh+DvYFHruyNSsnSp80uMWU17SoSMVaoW6SOx pnT0nv+SAVRwHSZwXs7FgfWqlea2htVQBro+L3G0dYV6WSEgAJSI5l4cc 5z5InGt/cKFvfX2DkOZFIdY+aSDGmcnO7dn7+jeopp4LC5KLv7eieQD0J KolhMRw79nfrO4vQNkGh61jE8RNRUVctD6ILf1gqIVPIL+JStBQYrH365 wBXUqPa40mja2bmQwxXoV09otqEZ+1npq0KsFYNIHlgbvm0YeympTIKHa Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="364922137" X-IronPort-AV: E=Sophos;i="6.03,229,1694761200"; d="scan'208";a="364922137" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 09:16:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="1003006475" X-IronPort-AV: E=Sophos;i="6.03,229,1694761200"; d="scan'208";a="1003006475" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 09:16:11 -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 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> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 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,