mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Chenyi Qiang <chenyi.qiang@intel.com>
To: <isaku.yamahata@intel.com>, <kvm@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Cc: <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>,
	"Sean Christopherson" <sean.j.christopherson@intel.com>
Subject: Re: [PATCH v12 013/106] KVM: TDX: create/destroy VM structure
Date: Wed, 1 Mar 2023 15:24:49 +0800	[thread overview]
Message-ID: <e23b30cc-80a1-774f-7d58-a676d989b5ce@intel.com> (raw)
In-Reply-To: <fd52ff91fbce051ecf9781af2e5c54138c995230.1677484918.git.isaku.yamahata@intel.com>



On 2/27/2023 4:22 PM, isaku.yamahata@intel.com wrote:
> From: Isaku Yamahata <isaku.yamahata@intel.com>
> 
> As the first step to create TDX guest, create/destroy VM struct.  Assign
> TDX private Host Key ID (HKID) to the TDX guest for memory encryption and
> allocate extra pages for the TDX guest. On destruction, free allocated
> pages, and HKID.
> 
> Before tearing down private page tables, TDX requires some resources of the
> guest TD to be destroyed (i.e. HKID must have been reclaimed, etc).  Add
> flush_shadow_all_private callback before tearing down private page tables
> for it.
> 
> Add vm_free() of kvm_x86_ops hook at the end of kvm_arch_destroy_vm()
> because some per-VM TDX resources, e.g. TDR, need to be freed after other
> TDX resources, e.g. HKID, were freed.
> 
> Co-developed-by: Kai Huang <kai.huang@intel.com>
> Signed-off-by: Kai Huang <kai.huang@intel.com>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
> 
> ---
> Changes v11 -> v12:
> - use cpu_feature_enabled().
> 
> Changes v10 -> v11:
> - Fix doule free in tdx_vm_free() by setting NULL.
> - replace struct tdx_td_page tdr and tdcs from struct kvm_tdx with
>   unsigned long
> ---
>  arch/x86/include/asm/kvm-x86-ops.h |   2 +
>  arch/x86/include/asm/kvm_host.h    |   2 +
>  arch/x86/kvm/vmx/main.c            |  34 ++-
>  arch/x86/kvm/vmx/tdx.c             | 440 ++++++++++++++++++++++++++++-
>  arch/x86/kvm/vmx/tdx.h             |   6 +-
>  arch/x86/kvm/vmx/x86_ops.h         |   9 +
>  arch/x86/kvm/x86.c                 |   8 +
>  7 files changed, 496 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/x86/include/asm/kvm-x86-ops.h b/arch/x86/include/asm/kvm-x86-ops.h
> index 7522c193f2b4..c30d2d2ad686 100644
> --- a/arch/x86/include/asm/kvm-x86-ops.h
> +++ b/arch/x86/include/asm/kvm-x86-ops.h
> @@ -24,7 +24,9 @@ KVM_X86_OP(is_vm_type_supported)
>  KVM_X86_OP_OPTIONAL(max_vcpus);
>  KVM_X86_OP_OPTIONAL(vm_enable_cap)
>  KVM_X86_OP(vm_init)
> +KVM_X86_OP_OPTIONAL(flush_shadow_all_private)
>  KVM_X86_OP_OPTIONAL(vm_destroy)
> +KVM_X86_OP_OPTIONAL(vm_free)
>  KVM_X86_OP_OPTIONAL_RET0(vcpu_precreate)
>  KVM_X86_OP(vcpu_create)
>  KVM_X86_OP(vcpu_free)
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index bc9ecba514a9..f4e82ee3d668 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -1551,7 +1551,9 @@ struct kvm_x86_ops {
>  	unsigned int vm_size;
>  	int (*vm_enable_cap)(struct kvm *kvm, struct kvm_enable_cap *cap);
>  	int (*vm_init)(struct kvm *kvm);
> +	void (*flush_shadow_all_private)(struct kvm *kvm);
>  	void (*vm_destroy)(struct kvm *kvm);
> +	void (*vm_free)(struct kvm *kvm);
>  
>  	/* Create, but do not attach this VCPU */
>  	int (*vcpu_precreate)(struct kvm *kvm);
> diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c
> index a090c029efd5..cdc73c09bf0b 100644
> --- a/arch/x86/kvm/vmx/main.c
> +++ b/arch/x86/kvm/vmx/main.c
> @@ -49,14 +49,40 @@ static int vt_vm_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap)
>  	return -EINVAL;
>  }
>  
> +static void vt_hardware_unsetup(void)
> +{
> +	tdx_hardware_unsetup();
> +	vmx_hardware_unsetup();
> +}
> +
>  static int vt_vm_init(struct kvm *kvm)
>  {
>  	if (is_td(kvm))
> -		return -EOPNOTSUPP;	/* Not ready to create guest TD yet. */
> +		return tdx_vm_init(kvm);
>  
>  	return vmx_vm_init(kvm);
>  }
>  
> +static void vt_flush_shadow_all_private(struct kvm *kvm)
> +{
> +	if (is_td(kvm))
> +		tdx_mmu_release_hkid(kvm);
> +}
> +
> +static void vt_vm_destroy(struct kvm *kvm)
> +{
> +	if (is_td(kvm))
> +		return;
> +
> +	vmx_vm_destroy(kvm);
> +}
> +
> +static void vt_vm_free(struct kvm *kvm)
> +{
> +	if (is_td(kvm))
> +		tdx_vm_free(kvm);
> +}
> +
>  static int vt_mem_enc_ioctl(struct kvm *kvm, void __user *argp)
>  {
>  	if (!is_td(kvm))
> @@ -81,7 +107,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = {
>  
>  	.check_processor_compatibility = vmx_check_processor_compat,
>  
> -	.hardware_unsetup = vmx_hardware_unsetup,
> +	.hardware_unsetup = vt_hardware_unsetup,
>  
>  	.hardware_enable = vmx_hardware_enable,
>  	.hardware_disable = vmx_hardware_disable,
> @@ -92,7 +118,9 @@ struct kvm_x86_ops vt_x86_ops __initdata = {
>  	.vm_size = sizeof(struct kvm_vmx),
>  	.vm_enable_cap = vt_vm_enable_cap,
>  	.vm_init = vt_vm_init,
> -	.vm_destroy = vmx_vm_destroy,
> +	.flush_shadow_all_private = vt_flush_shadow_all_private,
> +	.vm_destroy = vt_vm_destroy,
> +	.vm_free = vt_vm_free,
>  
>  	.vcpu_precreate = vmx_vcpu_precreate,
>  	.vcpu_create = vmx_vcpu_create,
> diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
> index 16e207168dc1..928eb47e7379 100644
> --- a/arch/x86/kvm/vmx/tdx.c
> +++ b/arch/x86/kvm/vmx/tdx.c
> @@ -6,6 +6,7 @@
>  #include "capabilities.h"
>  #include "x86_ops.h"
>  #include "tdx.h"
> +#include "tdx_ops.h"
>  #include "x86.h"
>  
>  #undef pr_fmt
> @@ -46,6 +47,271 @@ int tdx_vm_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap)
>  	return r;
>  }
>  
> +struct tdx_info {
> +	u8 nr_tdcs_pages;
> +};
> +
> +/* Info about the TDX module. */
> +static struct tdx_info tdx_info;
> +
> +/*
> + * Some TDX SEAMCALLs (TDH.MNG.CREATE, TDH.PHYMEM.CACHE.WB,
> + * TDH.MNG.KEY.RECLAIMID, TDH.MNG.KEY.FREEID etc) tries to acquire a global lock
> + * internally in TDX module.  If failed, TDX_OPERAND_BUSY is returned without
> + * spinning or waiting due to a constraint on execution time.  It's caller's
> + * responsibility to avoid race (or retry on TDX_OPERAND_BUSY).  Use this mutex
> + * to avoid race in TDX module because the kernel knows better about scheduling.
> + */
> +static DEFINE_MUTEX(tdx_lock);
> +static struct mutex *tdx_mng_key_config_lock;
> +
> +static __always_inline hpa_t set_hkid_to_hpa(hpa_t pa, u16 hkid)
> +{
> +	return pa | ((hpa_t)hkid << boot_cpu_data.x86_phys_bits);
> +}
> +
> +static inline bool is_td_created(struct kvm_tdx *kvm_tdx)
> +{
> +	return kvm_tdx->tdr_pa;
> +}
> +
> +static inline void tdx_hkid_free(struct kvm_tdx *kvm_tdx)
> +{
> +	tdx_guest_keyid_free(kvm_tdx->hkid);
> +	kvm_tdx->hkid = 0;
> +}
> +
> +static inline bool is_hkid_assigned(struct kvm_tdx *kvm_tdx)
> +{
> +	return kvm_tdx->hkid > 0;
> +}
> +
> +static void tdx_clear_page(unsigned long page_pa)
> +{
> +	const void *zero_page = (const void *) __va(page_to_phys(ZERO_PAGE(0)));
> +	void *page = __va(page_pa);
> +	unsigned long i;
> +
> +	if (!cpu_feature_enabled(X86_FEATURE_MOVDIR64B)) {
> +		clear_page(page);
> +		return;
> +	}
> +
> +	/*
> +	 * Zeroing the page is only necessary for systems with MKTME-i:
> +	 * when re-assign one page from old keyid to a new keyid, MOVDIR64B is
> +	 * required to clear/write the page with new keyid to prevent integrity
> +	 * error when read on the page with new keyid.
> +	 *
> +	 * clflush doesn't flush cache with HKID set.
> +	 * The cache line could be poisoned (even without MKTME-i), clear the
> +	 * poison bit.
> +	 */
> +	for (i = 0; i < PAGE_SIZE; i += 64)
> +		movdir64b(page + i, zero_page);
> +	/*
> +	 * MOVDIR64B store uses WC buffer.  Prevent following memory reads
> +	 * from seeing potentially poisoned cache.
> +	 */
> +	__mb();
> +}
> +
> +static int tdx_reclaim_page(hpa_t pa, bool do_wb, u16 hkid)
> +{
> +	struct tdx_module_output out;
> +	u64 err;
> +
> +	do {
> +		err = tdh_phymem_page_reclaim(pa, &out);
> +		/*
> +		 * TDH.PHYMEM.PAGE.RECLAIM is allowed only when TD is shutdown.
> +		 * state.  i.e. destructing TD.
> +		 * TDH.PHYMEM.PAGE.RECLAIM requires TDR and target page.
> +		 * Because we're destructing TD, it's rare to contend with TDR.
> +		 */
> +	} while (err == (TDX_OPERAND_BUSY | TDX_OPERAND_ID_RCX));
> +	if (WARN_ON_ONCE(err)) {
> +		pr_tdx_error(TDH_PHYMEM_PAGE_RECLAIM, err, &out);
> +		return -EIO;
> +	}
> +
> +	if (do_wb) {
> +		/*
> +		 * Only TDR page gets into this path.  No contention is expected
> +		 * because of the last page of TD.
> +		 */
> +		err = tdh_phymem_page_wbinvd(set_hkid_to_hpa(pa, hkid));
> +		if (WARN_ON_ONCE(err)) {
> +			pr_tdx_error(TDH_PHYMEM_PAGE_WBINVD, err, NULL);
> +			return -EIO;
> +		}
> +	}
> +
> +	tdx_clear_page(pa);
> +	return 0;
> +}
> +
> +static void tdx_reclaim_td_page(unsigned long td_page_pa)
> +{
> +	if (!td_page_pa)
> +		return;
> +	/*
> +	 * TDCX are being reclaimed.  TDX module maps TDCX with HKID
> +	 * assigned to the TD.  Here the cache associated to the TD
> +	 * was already flushed by TDH.PHYMEM.CACHE.WB before here, So
> +	 * cache doesn't need to be flushed again.
> +	 */
> +	if (tdx_reclaim_page(td_page_pa, false, 0))
> +		/*
> +		 * Leak the page on failure:
> +		 * tdx_reclaim_page() returns an error if and only if there's an
> +		 * unexpected, fatal error, e.g. a SEAMCALL with bad params,
> +		 * incorrect concurrency in KVM, a TDX Module bug, etc.
> +		 * Retrying at a later point is highly unlikely to be
> +		 * successful.
> +		 * No log here as tdx_reclaim_page() already did.
> +		 */
> +		return;
> +	free_page((unsigned long)__va(td_page_pa));
> +}
> +
> +static int tdx_do_tdh_phymem_cache_wb(void *param)
> +{
> +	u64 err = 0;
> +
> +	do {
> +		err = tdh_phymem_cache_wb(!!err);
> +	} while (err == TDX_INTERRUPTED_RESUMABLE);
> +
> +	/* Other thread may have done for us. */
> +	if (err == TDX_NO_HKID_READY_TO_WBCACHE)
> +		err = TDX_SUCCESS;
> +	if (WARN_ON_ONCE(err)) {
> +		pr_tdx_error(TDH_PHYMEM_CACHE_WB, err, NULL);
> +		return -EIO;
> +	}
> +
> +	return 0;
> +}
> +
> +void tdx_mmu_release_hkid(struct kvm *kvm)
> +{
> +	struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm);
> +	cpumask_var_t packages;
> +	bool cpumask_allocated;
> +	u64 err;
> +	int ret;
> +	int i;
> +
> +	if (!is_hkid_assigned(kvm_tdx))
> +		return;
> +
> +	if (!is_td_created(kvm_tdx))
> +		goto free_hkid;
> +
> +	cpumask_allocated = zalloc_cpumask_var(&packages, GFP_KERNEL);
> +	cpus_read_lock();
> +	for_each_online_cpu(i) {
> +		if (cpumask_allocated &&
> +			cpumask_test_and_set_cpu(topology_physical_package_id(i),
> +						packages))
> +			continue;
> +
> +		/*
> +		 * We can destroy multiple the guest TDs simultaneously.
> +		 * Prevent tdh_phymem_cache_wb from returning TDX_BUSY by
> +		 * serialization.
> +		 */
> +		mutex_lock(&tdx_lock);
> +		ret = smp_call_on_cpu(i, tdx_do_tdh_phymem_cache_wb, NULL, 1);
> +		mutex_unlock(&tdx_lock);
> +		if (ret)
> +			break;
> +	}
> +	cpus_read_unlock();
> +	free_cpumask_var(packages);
> +
> +	mutex_lock(&tdx_lock);
> +	err = tdh_mng_key_freeid(kvm_tdx->tdr_pa);
> +	mutex_unlock(&tdx_lock);
> +	if (WARN_ON_ONCE(err)) {
> +		pr_tdx_error(TDH_MNG_KEY_FREEID, err, NULL);
> +		pr_err("tdh_mng_key_freeid failed. HKID %d is leaked.\n",
> +			kvm_tdx->hkid);
> +		return;
> +	}
> +
> +free_hkid:
> +	tdx_hkid_free(kvm_tdx);
> +}
> +
> +void tdx_vm_free(struct kvm *kvm)
> +{
> +	struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm);
> +	int i;
> +
> +	/* Can't reclaim or free TD pages if teardown failed. */
> +	if (is_hkid_assigned(kvm_tdx))
> +		return;
> +
> +	if (kvm_tdx->tdcs_pa) {
> +		for (i = 0; i < tdx_info.nr_tdcs_pages; i++)
> +			tdx_reclaim_td_page(kvm_tdx->tdcs_pa[i]);
> +		kfree(kvm_tdx->tdcs_pa);
> +		kvm_tdx->tdcs_pa = NULL;
> +	}
> +
> +	if (!kvm_tdx->tdr_pa)
> +		return;
> +	/*
> +	 * TDX module maps TDR with TDX global HKID.  TDX module may access TDR
> +	 * while operating on TD (Especially reclaiming TDCS).  Cache flush with
> +	 * TDX global HKID is needed.
> +	 */
> +	if (tdx_reclaim_page(kvm_tdx->tdr_pa, true, tdx_global_keyid))
> +		return;
> +
> +	free_page((unsigned long)__va(kvm_tdx->tdr_pa));
> +	kvm_tdx->tdr_pa = 0;
> +}
> +
> +static int tdx_do_tdh_mng_key_config(void *param)
> +{
> +	hpa_t *tdr_p = param;
> +	u64 err;
> +
> +	do {
> +		err = tdh_mng_key_config(*tdr_p);
> +
> +		/*
> +		 * If it failed to generate a random key, retry it because this
> +		 * is typically caused by an entropy error of the CPU's random
> +		 * number generator.
> +		 */
> +	} while (err == TDX_KEY_GENERATION_FAILED);
> +
> +	if (WARN_ON_ONCE(err)) {
> +		pr_tdx_error(TDH_MNG_KEY_CONFIG, err, NULL);
> +		return -EIO;
> +	}
> +
> +	return 0;
> +}
> +
> +static int __tdx_td_init(struct kvm *kvm);
> +
> +int tdx_vm_init(struct kvm *kvm)
> +{
> +	/*
> +	 * TDX has its own limit of the number of vcpus in addition to
> +	 * KVM_MAX_VCPUS.
> +	 */
> +	kvm->max_vcpus = min(kvm->max_vcpus, TDX_MAX_VCPUS);
> +
> +	/* Place holder for TDX specific logic. */
> +	return __tdx_td_init(kvm);
> +}
> +
>  int tdx_dev_ioctl(void __user *argp)
>  {
>  	struct kvm_tdx_capabilities __user *user_caps;
> @@ -97,6 +363,160 @@ int tdx_dev_ioctl(void __user *argp)
>  	return 0;
>  }
>  
> +static int __tdx_td_init(struct kvm *kvm)
> +{
> +	struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm);
> +	cpumask_var_t packages;
> +	unsigned long *tdcs_pa = NULL;
> +	unsigned long tdr_pa = 0;
> +	unsigned long va;
> +	int ret, i;
> +	u64 err;
> +
> +	ret = tdx_guest_keyid_alloc();
> +	if (ret < 0)
> +		return ret;
> +	kvm_tdx->hkid = ret;
> +
> +	va = __get_free_page(GFP_KERNEL_ACCOUNT);
> +	if (!va)
> +		goto free_hkid;
> +	tdr_pa = __pa(va);
> +
> +	tdcs_pa = kcalloc(tdx_info.nr_tdcs_pages, sizeof(*kvm_tdx->tdcs_pa),
> +			  GFP_KERNEL_ACCOUNT | __GFP_ZERO);
> +	if (!tdcs_pa)
> +		goto free_tdr;
> +	for (i = 0; i < tdx_info.nr_tdcs_pages; i++) {
> +		va = __get_free_page(GFP_KERNEL_ACCOUNT);
> +		if (!va)
> +			goto free_tdcs;
> +		tdcs_pa[i] = __pa(va);
> +	}
> +
> +	if (!zalloc_cpumask_var(&packages, GFP_KERNEL)) {
> +		ret = -ENOMEM;
> +		goto free_tdcs;
> +	}
> +	cpus_read_lock();
> +	/*
> +	 * Need at least one CPU of the package to be online in order to
> +	 * program all packages for host key id.  Check it.
> +	 */
> +	for_each_present_cpu(i)
> +		cpumask_set_cpu(topology_physical_package_id(i), packages);
> +	for_each_online_cpu(i)
> +		cpumask_clear_cpu(topology_physical_package_id(i), packages);
> +	if (!cpumask_empty(packages)) {
> +		ret = -EIO;
> +		/*
> +		 * Because it's hard for human operator to figure out the
> +		 * reason, warn it.
> +		 */
> +		pr_warn("All packages need to have online CPU to create TD. Online CPU and retry.\n");
> +		goto free_packages;
> +	}
> +
> +	/*
> +	 * Acquire global lock to avoid TDX_OPERAND_BUSY:
> +	 * TDH.MNG.CREATE and other APIs try to lock the global Key Owner
> +	 * Table (KOT) to track the assigned TDX private HKID.  It doesn't spin
> +	 * to acquire the lock, returns TDX_OPERAND_BUSY instead, and let the
> +	 * caller to handle the contention.  This is because of time limitation
> +	 * usable inside the TDX module and OS/VMM knows better about process
> +	 * scheduling.
> +	 *
> +	 * APIs to acquire the lock of KOT:
> +	 * TDH.MNG.CREATE, TDH.MNG.KEY.FREEID, TDH.MNG.VPFLUSHDONE, and
> +	 * TDH.PHYMEM.CACHE.WB.
> +	 */
> +	mutex_lock(&tdx_lock);
> +	err = tdh_mng_create(tdr_pa, kvm_tdx->hkid);
> +	mutex_unlock(&tdx_lock);
> +	if (WARN_ON_ONCE(err)) {
> +		pr_tdx_error(TDH_MNG_CREATE, err, NULL);
> +		ret = -EIO;
> +		goto free_packages;
> +	}
> +	kvm_tdx->tdr_pa = tdr_pa;
> +
> +	for_each_online_cpu(i) {
> +		int pkg = topology_physical_package_id(i);
> +
> +		if (cpumask_test_and_set_cpu(pkg, packages))
> +			continue;
> +
> +		/*
> +		 * Program the memory controller in the package with an
> +		 * encryption key associated to a TDX private host key id
> +		 * assigned to this TDR.  Concurrent operations on same memory
> +		 * controller results in TDX_OPERAND_BUSY.  Avoid this race by
> +		 * mutex.
> +		 */
> +		mutex_lock(&tdx_mng_key_config_lock[pkg]);
> +		ret = smp_call_on_cpu(i, tdx_do_tdh_mng_key_config,
> +				      &kvm_tdx->tdr_pa, true);
> +		mutex_unlock(&tdx_mng_key_config_lock[pkg]);
> +		if (ret)
> +			break;
> +	}
> +	cpus_read_unlock();
> +	free_cpumask_var(packages);
> +	if (ret)
> +		goto teardown;
> +
> +	kvm_tdx->tdcs_pa = tdcs_pa;
> +	for (i = 0; i < tdx_info.nr_tdcs_pages; i++) {
> +		err = tdh_mng_addcx(kvm_tdx->tdr_pa, tdcs_pa[i]);
> +		if (WARN_ON_ONCE(err)) {
> +			pr_tdx_error(TDH_MNG_ADDCX, err, NULL);
> +			for (i++; i < tdx_info.nr_tdcs_pages; i++) {
> +				free_page((unsigned long)__va(tdcs_pa[i]));
> +				tdcs_pa[i] = 0;
> +			}
> +			ret = -EIO;
> +			goto teardown;
> +		}
> +	}
> +
> +	/*
> +	 * Note, TDH_MNG_INIT cannot be invoked here.  TDH_MNG_INIT requires a dedicated
> +	 * ioctl() to define the configure CPUID values for the TD.
> +	 */
> +	return 0;
> +
> +	/*
> +	 * The sequence for freeing resources from a partially initialized TD
> +	 * varies based on where in the initialization flow failure occurred.
> +	 * Simply use the full teardown and destroy, which naturally play nice
> +	 * with partial initialization.
> +	 */
> +teardown:
> +	tdx_mmu_release_hkid(kvm);
> +	tdx_vm_free(kvm);
> +	return ret;
> +
> +free_packages:
> +	cpus_read_unlock();
> +	free_cpumask_var(packages);
> +free_tdcs:
> +	for (i = 0; i < tdx_info.nr_tdcs_pages; i++) {
> +		if (tdcs_pa[i])
> +			free_page((unsigned long)__va(tdcs_pa[i]));
> +	}
> +	kfree(tdcs_pa);
> +	kvm_tdx->tdcs_pa = NULL;
> +
> +free_tdr:
> +	if (tdr_pa)
> +		free_page((unsigned long)__va(tdr_pa));
> +	kvm_tdx->tdr_pa = 0;
> +free_hkid:
> +	if (is_hkid_assigned(kvm_tdx))
> +		tdx_hkid_free(kvm_tdx);
> +	return ret;
> +}
> +
>  int tdx_vm_ioctl(struct kvm *kvm, void __user *argp)
>  {
>  	struct kvm_tdx_cmd tdx_cmd;
> @@ -137,9 +557,11 @@ static int __init tdx_module_setup(void)
>  		return ret;
>  	}
>  
> -	/* Sanitary check just in case. */
>  	tdsysinfo = tdx_get_sysinfo();
>  	WARN_ON(tdsysinfo->num_cpuid_config > TDX_MAX_NR_CPUID_CONFIGS);
> +	tdx_info = (struct tdx_info) {
> +		.nr_tdcs_pages = tdsysinfo->tdcs_base_size / PAGE_SIZE,
> +	};
>  
>  	pr_info("TDX is supported.\n");
>  	return 0;
> @@ -153,6 +575,8 @@ bool tdx_is_vm_type_supported(unsigned long type)
>  
>  int __init tdx_hardware_setup(struct kvm_x86_ops *x86_ops)
>  {
> +	int max_pkgs;
> +	int i;
>  	int r;
>  
>  	if (!enable_ept) {

...

> @@ -160,6 +584,14 @@ int __init tdx_hardware_setup(struct kvm_x86_ops *x86_ops)
>  		return -EINVAL;
>  	}
>  
> +	max_pkgs = topology_max_packages();
> +	tdx_mng_key_config_lock = kcalloc(max_pkgs, sizeof(*tdx_mng_key_config_lock),
> +				   GFP_KERNEL);
> +	if (!tdx_mng_key_config_lock)
> +		return -ENOMEM;
> +	for (i = 0; i < max_pkgs; i++)
> +		mutex_init(&tdx_mng_key_config_lock[i]);
> +
>  	/* TDX requires VMX. */
>  	r = vmxon_all();
>  	if (!r)
> @@ -168,3 +600,9 @@ int __init tdx_hardware_setup(struct kvm_x86_ops *x86_ops)
>  
>  	return r;
>  }
> +
> +void tdx_hardware_unsetup(void)
> +{

To align with tdx_hardware_setup(), add some check like:

if (!enable_ept || !enable_tdx)
	return;

> +	/* kfree accepts NULL. */
> +	kfree(tdx_mng_key_config_lock);
> +}




  reply	other threads:[~2023-03-01  7:25 UTC|newest]

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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e23b30cc-80a1-774f-7d58-a676d989b5ce@intel.com \
    --to=chenyi.qiang@intel.com \
    --cc=dmatlack@google.com \
    --cc=erdemaktas@google.com \
    --cc=isaku.yamahata@gmail.com \
    --cc=isaku.yamahata@intel.com \
    --cc=kai.huang@intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=sagis@google.com \
    --cc=sean.j.christopherson@intel.com \
    --cc=seanjc@google.com \
    --cc=zhi.wang.linux@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome