From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 462E71D2F46 for ; Tue, 5 Nov 2024 10:34:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730802867; cv=none; b=UPi522+/irH0sAlCQl45MKaIgmic+wYL30/UCJA6qARFOaqLdVHkWZjI66zhSJZiH3PN5LV8VagZMp+Og5pOUvpF4cHTvEWCXEwBgISQ4sX/ZbHwPi2yJrCpxNjhGaq5NgkXHsug2y41g2rcmgntj8a25SerGcCm7ZRpbuF1ORo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730802867; c=relaxed/simple; bh=d92eSQ3SH9wgdH2D92lh3/TgL5CaXpfjfpC9HE/1yns=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=gKt841oe28UpkB4DlwO4nrrqVBQCyx6Yqk3uz1fhPnb8NCwyLKvWOLiNc8y+qFDdO2/fPl47JGe4udISe2x31Yc1aXwK3J9ocbRLsNHlEooU9mG8p8nBGFdD+M9d/08U9wFuOdnOh+W+5jdiyHURd1gq8zeDC/l44CQF+euX47Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=jLaMPCSb; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jLaMPCSb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730802864; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=hHKZExTK3dmTqmM76pd2bHsg8SXvw82d+dXlGLStmmE=; b=jLaMPCSb9AQfLPh9EPxkDO1+6oUjcUgRq4rHmP1dMIJixB5Z9AMnXY7ppzSmYTSmNgsK84 fctQHRjsZt6UnQPp4Q7s+lvSK8hll46km02OMqm9r6ZlDnAm3oIcmrxnXRJ+JcpLcHlOzj UB8mgOOvV0GIWkiT0WmbuQ0KpEzcs6U= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-193-ypQ-or0vOwmw74_pkxEoWQ-1; Tue, 05 Nov 2024 05:34:20 -0500 X-MC-Unique: ypQ-or0vOwmw74_pkxEoWQ-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8998C1955EE6; Tue, 5 Nov 2024 10:34:18 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 57824300018D; Tue, 5 Nov 2024 10:34:11 +0000 (UTC) Date: Tue, 5 Nov 2024 10:34:08 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Xiaoyao Li Cc: Paolo Bonzini , Riku Voipio , Richard Henderson , Zhao Liu , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Ani Sinha , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Yanan Wang , Cornelia Huck , Eric Blake , Markus Armbruster , Marcelo Tosatti , rick.p.edgecombe@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: Re: [PATCH v6 09/60] i386/tdx: Initialize TDX before creating TD vcpus Message-ID: Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= References: <20241105062408.3533704-1-xiaoyao.li@intel.com> <20241105062408.3533704-10-xiaoyao.li@intel.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20241105062408.3533704-10-xiaoyao.li@intel.com> User-Agent: Mutt/2.2.13 (2024-03-09) X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 On Tue, Nov 05, 2024 at 01:23:17AM -0500, Xiaoyao Li wrote: > Invoke KVM_TDX_INIT in kvm_arch_pre_create_vcpu() that KVM_TDX_INIT > configures global TD configurations, e.g. the canonical CPUID config, > and must be executed prior to creating vCPUs. > > Use kvm_x86_arch_cpuid() to setup the CPUID settings for TDX VM. > > Note, this doesn't address the fact that QEMU may change the CPUID > configuration when creating vCPUs, i.e. punts on refactoring QEMU to > provide a stable CPUID config prior to kvm_arch_init(). > > Signed-off-by: Xiaoyao Li > Acked-by: Gerd Hoffmann > Acked-by: Markus Armbruster > --- > Changes in v6: > - setup xfam explicitly to fit with new uapi; > - use tdx_caps->cpuid to filter the input of cpuids because now KVM only > allows the leafs that reported via KVM_TDX_GET_CAPABILITIES; > > Changes in v4: > - mark init_vm with g_autofree() and use QEMU_LOCK_GUARD() to eliminate > the goto labels; (Daniel) > Changes in v3: > - Pass @errp in tdx_pre_create_vcpu() and pass error info to it. (Daniel) > --- > accel/kvm/kvm-all.c | 8 ++++ > target/i386/kvm/kvm.c | 15 +++++-- > target/i386/kvm/kvm_i386.h | 3 ++ > target/i386/kvm/meson.build | 2 +- > target/i386/kvm/tdx-stub.c | 8 ++++ > target/i386/kvm/tdx.c | 87 +++++++++++++++++++++++++++++++++++++ > target/i386/kvm/tdx.h | 6 +++ > 7 files changed, 125 insertions(+), 4 deletions(-) > create mode 100644 target/i386/kvm/tdx-stub.c > > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index 1732fa1adecd..4a1c9950894c 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -536,8 +536,15 @@ int kvm_init_vcpu(CPUState *cpu, Error **errp) > > trace_kvm_init_vcpu(cpu->cpu_index, kvm_arch_vcpu_id(cpu)); > > + /* > + * tdx_pre_create_vcpu() may call cpu_x86_cpuid(). It in turn may call > + * kvm_vm_ioctl(). Set cpu->kvm_state in advance to avoid NULL pointer > + * dereference. > + */ > + cpu->kvm_state = s; > ret = kvm_arch_pre_create_vcpu(cpu, errp); > if (ret < 0) { > + cpu->kvm_state = NULL; > goto err; > } > > @@ -546,6 +553,7 @@ int kvm_init_vcpu(CPUState *cpu, Error **errp) > error_setg_errno(errp, -ret, > "kvm_init_vcpu: kvm_create_vcpu failed (%lu)", > kvm_arch_vcpu_id(cpu)); > + cpu->kvm_state = NULL; > goto err; > } > > diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c > index afbf67a7fdaa..db676c1336ab 100644 > --- a/target/i386/kvm/kvm.c > +++ b/target/i386/kvm/kvm.c > @@ -38,6 +38,7 @@ > #include "kvm_i386.h" > #include "../confidential-guest.h" > #include "sev.h" > +#include "tdx.h" > #include "xen-emu.h" > #include "hyperv.h" > #include "hyperv-proto.h" > @@ -1824,9 +1825,8 @@ static void kvm_init_nested_state(CPUX86State *env) > } > } > > -static uint32_t kvm_x86_build_cpuid(CPUX86State *env, > - struct kvm_cpuid_entry2 *entries, > - uint32_t cpuid_i) > +uint32_t kvm_x86_build_cpuid(CPUX86State *env, struct kvm_cpuid_entry2 *entries, > + uint32_t cpuid_i) > { > uint32_t limit, i, j; > uint32_t unused; > @@ -2358,6 +2358,15 @@ int kvm_arch_init_vcpu(CPUState *cs) > return r; > } > > +int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp) > +{ > + if (is_tdx_vm()) { > + return tdx_pre_create_vcpu(cpu, errp); > + } > + > + return 0; > +} > + > int kvm_arch_destroy_vcpu(CPUState *cs) > { > X86CPU *cpu = X86_CPU(cs); > diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h > index efb0883bd968..b1baf9e7f910 100644 > --- a/target/i386/kvm/kvm_i386.h > +++ b/target/i386/kvm/kvm_i386.h > @@ -24,6 +24,9 @@ > #define kvm_ioapic_in_kernel() \ > (kvm_irqchip_in_kernel() && !kvm_irqchip_is_split()) > > +uint32_t kvm_x86_build_cpuid(CPUX86State *env, struct kvm_cpuid_entry2 *entries, > + uint32_t cpuid_i); > + > #else > > #define kvm_pit_in_kernel() 0 > diff --git a/target/i386/kvm/meson.build b/target/i386/kvm/meson.build > index 466bccb9cb17..3f44cdedb758 100644 > --- a/target/i386/kvm/meson.build > +++ b/target/i386/kvm/meson.build > @@ -8,7 +8,7 @@ i386_kvm_ss.add(files( > > i386_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files('xen-emu.c')) > > -i386_kvm_ss.add(when: 'CONFIG_TDX', if_true: files('tdx.c')) > +i386_kvm_ss.add(when: 'CONFIG_TDX', if_true: files('tdx.c'), if_false: files('tdx-stub.c')) > > i386_system_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_false: files('hyperv-stub.c')) > > diff --git a/target/i386/kvm/tdx-stub.c b/target/i386/kvm/tdx-stub.c > new file mode 100644 > index 000000000000..b614b46d3f4a > --- /dev/null > +++ b/target/i386/kvm/tdx-stub.c > @@ -0,0 +1,8 @@ > +#include "qemu/osdep.h" > + > +#include "tdx.h" > + > +int tdx_pre_create_vcpu(CPUState *cpu, Error **errp) > +{ > + return -EINVAL; > +} > diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c > index ff3ef9bd8657..1b7894e43c6f 100644 > --- a/target/i386/kvm/tdx.c > +++ b/target/i386/kvm/tdx.c > @@ -137,6 +137,91 @@ static int tdx_kvm_type(X86ConfidentialGuest *cg) > return KVM_X86_TDX_VM; > } > > +static int setup_td_xfam(X86CPU *x86cpu, Error **errp) > +{ > + CPUX86State *env = &x86cpu->env; > + uint64_t xfam; > + > + xfam = env->features[FEAT_XSAVE_XCR0_LO] | > + env->features[FEAT_XSAVE_XCR0_HI] | > + env->features[FEAT_XSAVE_XSS_LO] | > + env->features[FEAT_XSAVE_XSS_HI]; > + > + if (xfam & ~tdx_caps->supported_xfam) { > + error_setg(errp, "Invalid XFAM 0x%lx for TDX VM (supported: 0x%llx))", > + xfam, tdx_caps->supported_xfam); > + return -1; > + } > + > + tdx_guest->xfam = xfam; > + return 0; > +} > + > +static void tdx_filter_cpuid(struct kvm_cpuid2 *cpuids) > +{ > + int i, dest_cnt = 0; > + struct kvm_cpuid_entry2 *src, *dest, *conf; > + > + for (i = 0; i < cpuids->nent; i++) { > + src = cpuids->entries + i; > + conf = cpuid_find_entry(&tdx_caps->cpuid, src->function, src->index); > + if (!conf) { > + continue; > + } > + dest = cpuids->entries + dest_cnt; > + > + dest->function = src->function; > + dest->index = src->index; > + dest->flags = src->flags; > + dest->eax = src->eax & conf->eax; > + dest->ebx = src->ebx & conf->ebx; > + dest->ecx = src->ecx & conf->ecx; > + dest->edx = src->edx & conf->edx; > + > + dest_cnt++; > + } > + cpuids->nent = dest_cnt++; > +} > + > +int tdx_pre_create_vcpu(CPUState *cpu, Error **errp) > +{ > + X86CPU *x86cpu = X86_CPU(cpu); > + CPUX86State *env = &x86cpu->env; > + g_autofree struct kvm_tdx_init_vm *init_vm = NULL; > + int r = 0; > + > + QEMU_LOCK_GUARD(&tdx_guest->lock); > + if (tdx_guest->initialized) { > + return r; > + } > + > + init_vm = g_malloc0(sizeof(struct kvm_tdx_init_vm) + > + sizeof(struct kvm_cpuid_entry2) * KVM_MAX_CPUID_ENTRIES); > + > + r = setup_td_xfam(x86cpu, errp); > + if (r) { > + return r; > + } > + > + init_vm->cpuid.nent = kvm_x86_build_cpuid(env, init_vm->cpuid.entries, 0); > + tdx_filter_cpuid(&init_vm->cpuid); > + > + init_vm->attributes = tdx_guest->attributes; > + init_vm->xfam = tdx_guest->xfam; > + > + do { > + r = tdx_vm_ioctl(KVM_TDX_INIT_VM, 0, init_vm); > + } while (r == -EAGAIN); Other calls to tdx_vm_ioctl don't loop on EAGAIN. Is the need to do this retry specific to only KVM_TDX_INIT_VM, or should we push the EAGAIN retry logic inside tdx_vm_ioctl_helper so all callers benefit ? > + if (r < 0) { > + error_setg_errno(errp, -r, "KVM_TDX_INIT_VM failed"); > + return r; > + } > + > + tdx_guest->initialized = true; > + > + return 0; > +} With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|