From nobody Sat Nov 15 19:42:09 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1748589796; cv=none; d=zohomail.com; s=zohoarc; b=MAp1drNUBTy8L63+ubpwUwnjL9boIlhvfqwLTHnBzIuZJyQAKUF1ADRsAlNwIz/NO7FUtvheQw4P2kLhWNxt8nYBQzuGab+Uk5cQYXhk6PnVzjGL5fqqW+FOtaiRbIVvYYbbkGFZjBe3OGs2HGwryaatRqBNH8uGJvP5MXD1BlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748589796; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=h9U6F9ROkyxmj8G3C6KpcQV9jrfTPF26SEPd5+i+mvo=; b=HwDtSYNRZSl/gRtTFt9jjKugwQwWlgvanocFIMNsXNNYEmUWaxCRSuuDcNeS+GKE6eVA6v73xrVolD7eetbbIbL1nZctsFR5Mq5Q5mei75hegtAyz0nYNcK4zEWXZ+ZzJurh1+6G5EaZFqoi2hDLrU98RuUgFLeVTy09DSNhZLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748589796136907.1689876605033; Fri, 30 May 2025 00:23:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtw5-0000xd-QV; Fri, 30 May 2025 03:13:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtw3-0000vf-GP for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtw1-0006sF-Br for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:47 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-655-I6c64I-ZO0O840cDmwyijg-1; Fri, 30 May 2025 03:13:42 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-6023d9a86ffso1322147a12.3 for ; Fri, 30 May 2025 00:13:42 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-60567141d48sm1170388a12.60.2025.05.30.00.13.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h9U6F9ROkyxmj8G3C6KpcQV9jrfTPF26SEPd5+i+mvo=; b=ctAX127KwjidEMInXYOqtD7WH6FQs+mIYplcrdd+SPPOeJa/KJqHKsp8RgRfd3gUH5b1Uz ZvWUto5BsYoVSAk7i0fKDWPIosGuO1N7xG++t6aPQpKGpkWFLBIYdxM5q3ONcoUBXJME0e RnoaoA9nb/pWDX7556qv7WkHAMtDU9w= X-MC-Unique: I6c64I-ZO0O840cDmwyijg-1 X-Mimecast-MFC-AGG-ID: I6c64I-ZO0O840cDmwyijg_1748589221 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589220; x=1749194020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h9U6F9ROkyxmj8G3C6KpcQV9jrfTPF26SEPd5+i+mvo=; b=O4WydEPbKBYnCgAtSLFcDfYyrmhVlx6YYcYGAolZ4AfkmQg122/VjvaVN79FANRbeN 3QpG02zxHw5p8Wzq6A5gECunXT6mEu30jNeG94xG6UfdjULfeB+1+F70OJxlD3/LFSB3 InFkgR2rR8oewDQ7N17c2arIckwORto6bf1y5xie3+CxHR/OTF86rznD8wkj6VgqhZn9 6MFiyNWvL8el3H960FbKACpt/BADYjXSlf1Ls6O+9KdEIRfbMGR2BjxvTbuEEgtdygAU uvdHOtQ2RKmWEni0CrzG/W1a/mXr1aWdof51ba2p78FJvXbZ/I7Ict0SFaAoKWtEh5LM qMZQ== X-Gm-Message-State: AOJu0Yzs/+TVg0w+RI4xdEUXZ82QhXn8xhW85JsKaQ6tV5b2wQxcXnE+ fHCpNn+Pz/2J2zAFaKafuJqKp6E8n7byTuFvzrjlA9/jBt/rZj4MTZCySTv+xsbfzU/FFhAo2Pr I2qwHklygRIbfMEcFNvMRobKSqLYQy411C7VFODZIMwd9xATGQnexSkwLVrOl3+QdNFcKjdqsah 737wp5Cp8H1eSI9oTmpL1gm2KGf79c6XZ4uvmXsPN7 X-Gm-Gg: ASbGncuaYXdFftE62xL4JCGYyce22VMKhopiY+oEzK+rGHuXhRv40p9mgJMn6lAtDsd ZIQlyYKEj9NTn6nMZ9airhmZUWY9gzquIggqaMAp8EGPKvfmLCT3PUPSEjuHXtELT9Dc+ktaBJ0 5z5v8f6b80B3AczgBi+BWZ5xy52P65qHwQhV1Q9L4+tydp1ZTJ1duQh3f2t1p29xXgCrFtiWYAh 8TwX8WA6neOjEAPUyMxhJZSNcenNG/OsgNIK0ZkDnUq2FE9RFIJMtGE/IWRLjAVn/ajb5lFsLCC ssEfkACpOn5f/w== X-Received: by 2002:a05:6402:3483:b0:5ff:97dd:21d6 with SMTP id 4fb4d7f45d1cf-6057c602e45mr993881a12.17.1748589220010; Fri, 30 May 2025 00:13:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IES7dGjVymmNyZrBCi1R1iD3nM2I6KiXKI8iib4reMEMx8MHsO1JPBn3ZsBInaJ7oqcZt3O+Q== X-Received: by 2002:a05:6402:3483:b0:5ff:97dd:21d6 with SMTP id 4fb4d7f45d1cf-6057c602e45mr993853a12.17.1748589219514; Fri, 30 May 2025 00:13:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , Gerd Hoffmann , Markus Armbruster , Zhao Liu Subject: [PULL 20/77] i386/tdx: Initialize TDX before creating TD vcpus Date: Fri, 30 May 2025 09:11:50 +0200 Message-ID: <20250530071250.2050910-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530071250.2050910-1-pbonzini@redhat.com> References: <20250530071250.2050910-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1748589798538116600 Content-Type: text/plain; charset="utf-8" From: Xiaoyao Li Invoke KVM_TDX_INIT_VM in kvm_arch_pre_create_vcpu() that KVM_TDX_INIT_VM 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 Reviewed-by: Zhao Liu Link: https://lore.kernel.org/r/20250508150002.689633-9-xiaoyao.li@intel.com Signed-off-by: Paolo Bonzini --- target/i386/kvm/kvm_i386.h | 5 ++ target/i386/kvm/tdx.h | 6 +++ target/i386/kvm/kvm.c | 16 +++--- target/i386/kvm/tdx-stub.c | 10 ++++ target/i386/kvm/tdx.c | 105 ++++++++++++++++++++++++++++++++++++ target/i386/kvm/meson.build | 2 +- 6 files changed, 137 insertions(+), 7 deletions(-) create mode 100644 target/i386/kvm/tdx-stub.c diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h index ed1e61fb8ba..dc696cb7238 100644 --- a/target/i386/kvm/kvm_i386.h +++ b/target/i386/kvm/kvm_i386.h @@ -59,6 +59,11 @@ uint64_t kvm_swizzle_msi_ext_dest_id(uint64_t address); void kvm_update_msi_routes_all(void *private, bool global, uint32_t index, uint32_t mask); =20 +struct kvm_cpuid_entry2 *cpuid_find_entry(struct kvm_cpuid2 *cpuid, + uint32_t function, + uint32_t index); +uint32_t kvm_x86_build_cpuid(CPUX86State *env, struct kvm_cpuid_entry2 *en= tries, + uint32_t cpuid_i); #endif /* CONFIG_KVM */ =20 void kvm_pc_setup_irq_routing(bool pci_enabled); diff --git a/target/i386/kvm/tdx.h b/target/i386/kvm/tdx.h index de8ae919616..4e2b5c61ff5 100644 --- a/target/i386/kvm/tdx.h +++ b/target/i386/kvm/tdx.h @@ -19,7 +19,11 @@ typedef struct TdxGuestClass { typedef struct TdxGuest { X86ConfidentialGuest parent_obj; =20 + QemuMutex lock; + + bool initialized; uint64_t attributes; /* TD attributes */ + uint64_t xfam; } TdxGuest; =20 #ifdef CONFIG_TDX @@ -28,4 +32,6 @@ bool is_tdx_vm(void); #define is_tdx_vm() 0 #endif /* CONFIG_TDX */ =20 +int tdx_pre_create_vcpu(CPUState *cpu, Error **errp); + #endif /* QEMU_I386_TDX_H */ diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 446f0600d4e..e98f1ee26a6 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" @@ -415,9 +416,9 @@ static uint32_t cpuid_entry_get_reg(struct kvm_cpuid_en= try2 *entry, int reg) =20 /* Find matching entry for function/index on kvm_cpuid2 struct */ -static struct kvm_cpuid_entry2 *cpuid_find_entry(struct kvm_cpuid2 *cpuid, - uint32_t function, - uint32_t index) +struct kvm_cpuid_entry2 *cpuid_find_entry(struct kvm_cpuid2 *cpuid, + uint32_t function, + uint32_t index) { int i; for (i =3D 0; i < cpuid->nent; ++i) { @@ -1822,9 +1823,8 @@ static void kvm_init_nested_state(CPUX86State *env) } } =20 -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 *en= tries, + uint32_t cpuid_i) { uint32_t limit, i, j; uint32_t unused; @@ -2053,6 +2053,10 @@ full: =20 int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp) { + if (is_tdx_vm()) { + return tdx_pre_create_vcpu(cpu, errp); + } + return 0; } =20 diff --git a/target/i386/kvm/tdx-stub.c b/target/i386/kvm/tdx-stub.c new file mode 100644 index 00000000000..2344433594e --- /dev/null +++ b/target/i386/kvm/tdx-stub.c @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#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 3750889453d..2d2d48c083e 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -149,6 +149,109 @@ static int tdx_kvm_type(X86ConfidentialGuest *cg) return KVM_X86_TDX_VM; } =20 +static int setup_td_xfam(X86CPU *x86cpu, Error **errp) +{ + CPUX86State *env =3D &x86cpu->env; + uint64_t xfam; + + xfam =3D 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 =3D xfam; + return 0; +} + +static void tdx_filter_cpuid(struct kvm_cpuid2 *cpuids) +{ + int i, dest_cnt =3D 0; + struct kvm_cpuid_entry2 *src, *dest, *conf; + + for (i =3D 0; i < cpuids->nent; i++) { + src =3D cpuids->entries + i; + conf =3D cpuid_find_entry(&tdx_caps->cpuid, src->function, src->in= dex); + if (!conf) { + continue; + } + dest =3D cpuids->entries + dest_cnt; + + dest->function =3D src->function; + dest->index =3D src->index; + dest->flags =3D src->flags; + dest->eax =3D src->eax & conf->eax; + dest->ebx =3D src->ebx & conf->ebx; + dest->ecx =3D src->ecx & conf->ecx; + dest->edx =3D src->edx & conf->edx; + + dest_cnt++; + } + cpuids->nent =3D dest_cnt++; +} + +int tdx_pre_create_vcpu(CPUState *cpu, Error **errp) +{ + X86CPU *x86cpu =3D X86_CPU(cpu); + CPUX86State *env =3D &x86cpu->env; + g_autofree struct kvm_tdx_init_vm *init_vm =3D NULL; + Error *local_err =3D NULL; + int retry =3D 10000; + int r =3D 0; + + QEMU_LOCK_GUARD(&tdx_guest->lock); + if (tdx_guest->initialized) { + return r; + } + + init_vm =3D g_malloc0(sizeof(struct kvm_tdx_init_vm) + + sizeof(struct kvm_cpuid_entry2) * KVM_MAX_CPUID_EN= TRIES); + + r =3D setup_td_xfam(x86cpu, errp); + if (r) { + return r; + } + + init_vm->cpuid.nent =3D kvm_x86_build_cpuid(env, init_vm->cpuid.entrie= s, 0); + tdx_filter_cpuid(&init_vm->cpuid); + + init_vm->attributes =3D tdx_guest->attributes; + init_vm->xfam =3D tdx_guest->xfam; + + /* + * KVM_TDX_INIT_VM gets -EAGAIN when KVM side SEAMCALL(TDH_MNG_CREATE) + * gets TDX_RND_NO_ENTROPY due to Random number generation (e.g., RDRA= ND or + * RDSEED) is busy. + * + * Retry for the case. + */ + do { + error_free(local_err); + local_err =3D NULL; + r =3D tdx_vm_ioctl(KVM_TDX_INIT_VM, 0, init_vm, &local_err); + } while (r =3D=3D -EAGAIN && --retry); + + if (r < 0) { + if (!retry) { + error_append_hint(&local_err, "Hardware RNG (Random Number " + "Generator) is busy occupied by someone (via RDRAND/RDSEED) " + "maliciously, which leads to KVM_TDX_INIT_VM keeping failure " + "due to lack of entropy.\n"); + } + error_propagate(errp, local_err); + return r; + } + + tdx_guest->initialized =3D true; + + return 0; +} + /* tdx guest */ OBJECT_DEFINE_TYPE_WITH_INTERFACES(TdxGuest, tdx_guest, @@ -162,6 +265,8 @@ static void tdx_guest_init(Object *obj) ConfidentialGuestSupport *cgs =3D CONFIDENTIAL_GUEST_SUPPORT(obj); TdxGuest *tdx =3D TDX_GUEST(obj); =20 + qemu_mutex_init(&tdx->lock); + cgs->require_guest_memfd =3D true; tdx->attributes =3D 0; =20 diff --git a/target/i386/kvm/meson.build b/target/i386/kvm/meson.build index 466bccb9cb1..3f44cdedb75 100644 --- a/target/i386/kvm/meson.build +++ b/target/i386/kvm/meson.build @@ -8,7 +8,7 @@ i386_kvm_ss.add(files( =20 i386_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files('xen-emu.c')) =20 -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: fil= es('tdx-stub.c')) =20 i386_system_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_f= alse: files('hyperv-stub.c')) =20 --=20 2.49.0