Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp562651rwb; Thu, 12 Jan 2023 09:20:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXuk7m6ROJfGOzixqNQ3u883Qcqx3uULxyucBDJgh7Psw/EwI/xDZS6tp72OaP99s4qQXV+K X-Received: by 2002:a17:907:a789:b0:7c0:bbab:22e5 with SMTP id vx9-20020a170907a78900b007c0bbab22e5mr70399796ejc.16.1673544053304; Thu, 12 Jan 2023 09:20:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673544053; cv=none; d=google.com; s=arc-20160816; b=OnJ/Zl33zmVyNLBpa8gGHutQKQmZwwmSqK7nYNMPXYjo2mlXN+UDbLURic/nl2tIgy QUG2tjcFUCBAnsBIzElYhaibidpeB9o+7qGfa2wM14MVSymKQByE7oJhvJPWLvdYnSqH rLKRav29G39JGCb9Ajyhc4r4C2hBuEPAqQhXNHNwZ0BRydaJ8td6pZKMNTbKm0te3HX3 N8C8jZD+AybSuDVADeBgz7AqJ2oAwOVbW1lSt1jmiuKQsFaBa+iGB9b7qg3GhXU30rzz Wzsg9OFvRjaizkyYiqc+wXBrI/GHWf6uwAsotWGNWO9u2AUH3rbAlusdYWprlqAlC/J4 /xhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8/nNlcITLSb1pVcWEX+xnUWbCtdObf9RT+VOtIB7mrA=; b=raH7NoQCxbAbY+09cL9CjtiL9ThazTO3jH+MfVbGt1WPri4AOj/fW/t5GaB/auSyIB zzXby3a04M2QPe1FvzH1tUkFxFSLX218hnolQfawvYCZG33rGbjCV9gzyz+UQ7iLv4bx bVJ/rTG+/DFgEGKibEHCBb5VVCRqaw/HKfmjExSJ34J8V6gLCVvgEu5zklofLnS0uNo1 lf+46fRLSSfP0i8KItr0W6IV+9qe8hu5ARGuyMMSVtuOin5etahCapTDg/gNaKtarmw/ N3aAyDRUdgk/I/WU/YUriVOlKijKCmURIX2T+GzppjP4LhWIvUkGth2R5HrOR8sWrzxO Q1xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VVqifL+0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xi9-20020a170906dac900b007a71a3cb3afsi19857151ejb.294.2023.01.12.09.20.41; Thu, 12 Jan 2023 09:20:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VVqifL+0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240739AbjALQmc (ORCPT + 50 others); Thu, 12 Jan 2023 11:42:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234248AbjALQh3 (ORCPT ); Thu, 12 Jan 2023 11:37:29 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4264C14014; Thu, 12 Jan 2023 08:33:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673541229; x=1705077229; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h7qAaoTHP3Mx9XL6WYxJQkuZAGoghRIXX9jmbmOYBaI=; b=VVqifL+0LB5r4szzInbIJktTHjddDomPNDC8LG8Sd1MB0p/MYufWKHGd u5CBqKx4uCdaPZi3OCSXaVDpTdJvdBlewf0qw17hzISaLE7jSeNqTOBGN T4eN+WhzQeaLpez4LN0vhN6Kw7LKe/Bz1asiya9TvQEDUYjV6kC94YrTj 9n/XZ//rvHBWUnpd1VB1ezAhJso2Yz+hnM5de9P8Pq9kSXuCFDEbxrcSB +pipKkwMRq2TSemeOIQVcqTDPrSqJljF8DZbfdBT2KdcauAZjsq5a8SYD BG/38y3dWRVAU5fx7IY9fXT+p8OxALFHqhnd5TRxdgVyWleHjHC1yHAdF A==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="323811658" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="323811658" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 08:33:20 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="721151633" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="721151633" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 08:33:20 -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 Subject: [PATCH v11 004/113] KVM: TDX: Initialize the TDX module when loading the KVM intel kernel module Date: Thu, 12 Jan 2023 08:31:12 -0800 Message-Id: <60c842f347eaecdd0673bdc63acd95b82eeeda9c.1673539699.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Isaku Yamahata TDX requires several initialization steps for KVM to create guest TDs. Detect CPU feature, enable VMX (TDX is based on VMX), detect the TDX module availability, and initialize it. This patch implements those steps. There are several options on when to initialize the TDX module. A.) kernel module loading time, B.) the first guest TD creation time. A.) was chosen. With B.), a user may hit an error of the TDX initialization when trying to create the first guest TD. The machine that fails to initialize the TDX module can't boot any guest TD further. Such failure is undesirable and a surprise because the user expects that the machine can accommodate guest TD, but actually not. So A.) is better than B.). Introduce a module parameter, enable_tdx, to explicitly enable TDX KVM support. It's off by default to keep same behavior for those who don't use TDX. Implement hardware_setup method to detect TDX feature of CPU. Because TDX requires all present CPUs to enable VMX (VMXON). The x86 specific kvm_arch_post_hardware_enable_setup overrides the existing weak symbol of kvm_arch_post_hardware_enable_setup which is called at the KVM module initialization. Suggested-by: Sean Christopherson Signed-off-by: Isaku Yamahata --- arch/x86/kvm/Makefile | 1 + arch/x86/kvm/vmx/main.c | 33 +++++++++++++++++++++++----- arch/x86/kvm/vmx/tdx.c | 44 ++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/vmx.c | 39 +++++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/x86_ops.h | 10 +++++++++ 5 files changed, 122 insertions(+), 5 deletions(-) create mode 100644 arch/x86/kvm/vmx/tdx.c diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index 0e894ae23cbc..4b01ab842ab7 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile @@ -25,6 +25,7 @@ kvm-$(CONFIG_KVM_SMM) += smm.o kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \ vmx/hyperv.o vmx/nested.o vmx/posted_intr.o vmx/main.o kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o +kvm-intel-$(CONFIG_INTEL_TDX_HOST) += vmx/tdx.o kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o \ svm/sev.o svm/hyperv.o diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c index 18f659d1d456..f5d1166d2718 100644 --- a/arch/x86/kvm/vmx/main.c +++ b/arch/x86/kvm/vmx/main.c @@ -7,6 +7,22 @@ #include "pmu.h" #include "tdx.h" +static bool enable_tdx __ro_after_init = IS_ENABLED(CONFIG_INTEL_TDX_HOST); +module_param_named(tdx, enable_tdx, bool, 0444); + +static __init int vt_hardware_setup(void) +{ + int ret; + + ret = vmx_hardware_setup(); + if (ret) + return ret; + + enable_tdx = enable_tdx && !tdx_hardware_setup(&vt_x86_ops); + + return 0; +} + struct kvm_x86_ops vt_x86_ops __initdata = { .name = KBUILD_MODNAME, @@ -149,7 +165,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = { }; struct kvm_x86_init_ops vt_init_ops __initdata = { - .hardware_setup = vmx_hardware_setup, + .hardware_setup = vt_hardware_setup, .handle_intel_pt_intr = NULL, .runtime_ops = &vt_x86_ops, @@ -182,10 +198,17 @@ static int __init vt_init(void) * Common KVM initialization _must_ come last, after this, /dev/kvm is * exposed to userspace! */ - vt_x86_ops.vm_size = max(sizeof(struct kvm_vmx), sizeof(struct kvm_tdx)); - vcpu_size = max(sizeof(struct vcpu_vmx), sizeof(struct vcpu_tdx)); - vcpu_align = max(__alignof__(struct vcpu_vmx), - __alignof__(struct vcpu_tdx)); + vt_x86_ops.vm_size = sizeof(struct kvm_vmx); + vcpu_size = sizeof(struct vcpu_vmx); + vcpu_align = __alignof__(struct vcpu_vmx); + if (enable_tdx) { + vt_x86_ops.vm_size = max_t(unsigned int, vt_x86_ops.vm_size, + sizeof(struct kvm_tdx)); + vcpu_size = max_t(unsigned int, vcpu_size, + sizeof(struct vcpu_tdx)); + vcpu_align = max_t(unsigned int, vcpu_align, + __alignof__(struct vcpu_tdx)); + } r = kvm_init(vcpu_size, vcpu_align, THIS_MODULE); if (r) goto err_kvm_init; diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c new file mode 100644 index 000000000000..d7a276118940 --- /dev/null +++ b/arch/x86/kvm/vmx/tdx.c @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +#include + +#include + +#include "capabilities.h" +#include "x86_ops.h" +#include "tdx.h" +#include "x86.h" + +#undef pr_fmt +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +static int __init tdx_module_setup(void) +{ + int ret; + + ret = tdx_enable(); + if (ret) { + pr_info("Failed to initialize TDX module.\n"); + return ret; + } + + pr_info("TDX is supported.\n"); + return 0; +} + +int __init tdx_hardware_setup(struct kvm_x86_ops *x86_ops) +{ + int r; + + if (!enable_ept) { + pr_warn("Cannot enable TDX with EPT disabled\n"); + return -EINVAL; + } + + /* TDX requires VMX. */ + r = vmxon_all(); + if (!r) + r = tdx_module_setup(); + vmxoff_all(); + + return r; +} diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 5de1792c9902..5dc7687dcf16 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -8147,6 +8147,45 @@ static unsigned int vmx_handle_intel_pt_intr(void) return 1; } +static __init void vmxon(void *arg) +{ + int cpu = raw_smp_processor_id(); + u64 phys_addr = __pa(per_cpu(vmxarea, cpu)); + atomic_t *failed = arg; + int r; + + if (cr4_read_shadow() & X86_CR4_VMXE) { + r = -EBUSY; + goto out; + } + + r = kvm_cpu_vmxon(phys_addr); +out: + if (r) + atomic_inc(failed); +} + +__init int vmxon_all(void) +{ + atomic_t failed = ATOMIC_INIT(0); + + on_each_cpu(vmxon, &failed, 1); + + if (atomic_read(&failed)) + return -EBUSY; + return 0; +} + +static __init void vmxoff(void *junk) +{ + cpu_vmxoff(); +} + +__init void vmxoff_all(void) +{ + on_each_cpu(vmxoff, NULL, 1); +} + static __init void vmx_setup_user_return_msrs(void) { diff --git a/arch/x86/kvm/vmx/x86_ops.h b/arch/x86/kvm/vmx/x86_ops.h index 051b5c4b5c2f..fbc57fcbdd21 100644 --- a/arch/x86/kvm/vmx/x86_ops.h +++ b/arch/x86/kvm/vmx/x86_ops.h @@ -20,6 +20,10 @@ bool kvm_is_vmx_supported(void); int __init vmx_init(void); void vmx_exit(void); +__init int vmxon_all(void); +__init void vmxoff_all(void); +__init int vmx_hardware_setup(void); + extern struct kvm_x86_ops vt_x86_ops __initdata; extern struct kvm_x86_init_ops vt_init_ops __initdata; @@ -133,4 +137,10 @@ void vmx_cancel_hv_timer(struct kvm_vcpu *vcpu); #endif void vmx_setup_mce(struct kvm_vcpu *vcpu); +#ifdef CONFIG_INTEL_TDX_HOST +int __init tdx_hardware_setup(struct kvm_x86_ops *x86_ops); +#else +static inline int tdx_hardware_setup(struct kvm_x86_ops *x86_ops) { return 0; } +#endif + #endif /* __KVM_X86_VMX_X86_OPS_H */ -- 2.25.1