From nobody Mon Feb 9 20:59:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1626405150543714.3175751072191; Thu, 15 Jul 2021 20:12:30 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-128-YQXS-F0uO-i4y0NINwMoJg-1; Thu, 15 Jul 2021 23:12:27 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12EE25074F; Fri, 16 Jul 2021 03:12:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E1E1110016FD; Fri, 16 Jul 2021 03:12:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id AD57818005A2; Fri, 16 Jul 2021 03:12:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16G3CBBP005948 for ; Thu, 15 Jul 2021 23:12:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id E6D45113B7C; Fri, 16 Jul 2021 03:12:10 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E1DB4113B76 for ; Fri, 16 Jul 2021 03:12:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C65B280015A for ; Fri, 16 Jul 2021 03:12:10 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-476-pXUzq6NrOA2-AlTzyUBCiw-2; Thu, 15 Jul 2021 23:12:06 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2021 20:12:05 -0700 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.114]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2021 20:12:03 -0700 X-MC-Unique: YQXS-F0uO-i4y0NINwMoJg-1 X-MC-Unique: pXUzq6NrOA2-AlTzyUBCiw-2 X-IronPort-AV: E=McAfee;i="6200,9189,10046"; a="296308784" X-IronPort-AV: E=Sophos;i="5.84,244,1620716400"; d="scan'208";a="296308784" X-IronPort-AV: E=Sophos;i="5.84,244,1620716400"; d="scan'208";a="495774455" From: Zhenzhong Duan To: libvir-list@redhat.com Subject: [RFC PATCH v2 8/8] qemu: Add firmware descriptor support for TDX Date: Fri, 16 Jul 2021 11:10:36 +0800 Message-Id: <20210716031036.189228-9-zhenzhong.duan@intel.com> In-Reply-To: <20210716031036.189228-1-zhenzhong.duan@intel.com> References: <20210716031036.189228-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: isaku.yamahata@intel.com, pkrempa@redhat.com, jun.j.tian@intel.com, chenyi.qiang@intel.com, phrdina@redhat.com, zhenzhong.duan@intel.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1626405150981100001 Content-Type: text/plain; charset="utf-8" Add a firmware descriptor support for TDVF, then libvirt can auto match TDVF fimware with td-guest. Signed-off-by: Zhenzhong Duan --- docs/schemas/domaincommon.rng | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_firmware.c | 101 +++++++++++++++++++++++++++++++++- src/qemu/qemu_validate.c | 7 +++ 4 files changed, 108 insertions(+), 3 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9d0b51ee12..8232025bf7 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -275,6 +275,7 @@ bios efi + generic diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d3c30a17e7..a01d4c26db 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5934,6 +5934,8 @@ virQEMUCapsFillDomainOSCaps(virDomainCapsOS *os, VIR_DOMAIN_CAPS_ENUM_SET(os->firmware, VIR_DOMAIN_OS_DEF_FIRMWARE_= BIOS); if (autoFirmwares & (1ULL << VIR_DOMAIN_OS_DEF_FIRMWARE_EFI)) VIR_DOMAIN_CAPS_ENUM_SET(os->firmware, VIR_DOMAIN_OS_DEF_FIRMWARE_= EFI); + if (autoFirmwares & (1ULL << VIR_DOMAIN_OS_DEF_FIRMWARE_GENERIC)) + VIR_DOMAIN_CAPS_ENUM_SET(os->firmware, VIR_DOMAIN_OS_DEF_FIRMWARE_= GENERIC); =20 if (virQEMUCapsFillDomainLoaderCaps(capsLoader, secure, firmwaresAlt ? firmwaresAlt : firm= wares, diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index e144b36f94..28e006eb82 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -84,12 +84,18 @@ struct _qemuFirmwareMappingMemory { char *filename; }; =20 +typedef struct _qemuFirmwareMappingGeneric qemuFirmwareMappingGeneric; +struct _qemuFirmwareMappingGeneric { + char *filename; +}; + =20 typedef enum { QEMU_FIRMWARE_DEVICE_NONE =3D 0, QEMU_FIRMWARE_DEVICE_FLASH, QEMU_FIRMWARE_DEVICE_KERNEL, QEMU_FIRMWARE_DEVICE_MEMORY, + QEMU_FIRMWARE_DEVICE_GENERIC, =20 QEMU_FIRMWARE_DEVICE_LAST } qemuFirmwareDevice; @@ -101,6 +107,7 @@ VIR_ENUM_IMPL(qemuFirmwareDevice, "flash", "kernel", "memory", + "generic", ); =20 =20 @@ -112,6 +119,7 @@ struct _qemuFirmwareMapping { qemuFirmwareMappingFlash flash; qemuFirmwareMappingKernel kernel; qemuFirmwareMappingMemory memory; + qemuFirmwareMappingGeneric generic; } data; }; =20 @@ -135,6 +143,7 @@ typedef enum { QEMU_FIRMWARE_FEATURE_SECURE_BOOT, QEMU_FIRMWARE_FEATURE_VERBOSE_DYNAMIC, QEMU_FIRMWARE_FEATURE_VERBOSE_STATIC, + QEMU_FIRMWARE_FEATURE_INTEL_TDX, =20 QEMU_FIRMWARE_FEATURE_LAST } qemuFirmwareFeature; @@ -151,7 +160,8 @@ VIR_ENUM_IMPL(qemuFirmwareFeature, "requires-smm", "secure-boot", "verbose-dynamic", - "verbose-static" + "verbose-static", + "intel-tdx" ); =20 =20 @@ -213,6 +223,13 @@ qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappi= ngMemory *memory) } =20 =20 +static void +qemuFirmwareMappingGenericFreeContent(qemuFirmwareMappingGeneric *generic) +{ + g_free(generic->filename); +} + + static void qemuFirmwareMappingFreeContent(qemuFirmwareMapping *mapping) { @@ -226,6 +243,9 @@ qemuFirmwareMappingFreeContent(qemuFirmwareMapping *map= ping) case QEMU_FIRMWARE_DEVICE_MEMORY: qemuFirmwareMappingMemoryFreeContent(&mapping->data.memory); break; + case QEMU_FIRMWARE_DEVICE_GENERIC: + qemuFirmwareMappingGenericFreeContent(&mapping->data.generic); + break; case QEMU_FIRMWARE_DEVICE_NONE: case QEMU_FIRMWARE_DEVICE_LAST: break; @@ -424,6 +444,25 @@ qemuFirmwareMappingMemoryParse(const char *path, } =20 =20 +static int +qemuFirmwareMappingGenericParse(const char *path, + virJSONValue *doc, + qemuFirmwareMappingGeneric *generic) +{ + const char *filename; + + if (!(filename =3D virJSONValueObjectGetString(doc, "filename"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("missing 'filename' in '%s'"), + path); + } + + generic->filename =3D g_strdup(filename); + + return 0; +} + + static int qemuFirmwareMappingParse(const char *path, virJSONValue *doc, @@ -469,6 +508,10 @@ qemuFirmwareMappingParse(const char *path, if (qemuFirmwareMappingMemoryParse(path, mapping, &fw->mapping.dat= a.memory) < 0) return -1; break; + case QEMU_FIRMWARE_DEVICE_GENERIC: + if (qemuFirmwareMappingGenericParse(path, mapping, &fw->mapping.da= ta.generic) < 0) + return -1; + break; =20 case QEMU_FIRMWARE_DEVICE_NONE: case QEMU_FIRMWARE_DEVICE_LAST: @@ -740,6 +783,19 @@ qemuFirmwareMappingMemoryFormat(virJSONValue *mapping, } =20 =20 +static int +qemuFirmwareMappingGenericFormat(virJSONValue *mapping, + qemuFirmwareMappingGeneric *generic) +{ + if (virJSONValueObjectAppendString(mapping, + "filename", + generic->filename) < 0) + return -1; + + return 0; +} + + static int qemuFirmwareMappingFormat(virJSONValue *doc, qemuFirmware *fw) @@ -764,6 +820,10 @@ qemuFirmwareMappingFormat(virJSONValue *doc, if (qemuFirmwareMappingMemoryFormat(mapping, &fw->mapping.data.mem= ory) < 0) return -1; break; + case QEMU_FIRMWARE_DEVICE_GENERIC: + if (qemuFirmwareMappingGenericFormat(mapping, &fw->mapping.data.ge= neric) < 0) + return -1; + break; =20 case QEMU_FIRMWARE_DEVICE_NONE: case QEMU_FIRMWARE_DEVICE_LAST: @@ -905,6 +965,7 @@ qemuFirmwareOSInterfaceTypeFromOsDefFirmware(int fw) case VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS: return QEMU_FIRMWARE_OS_INTERFACE_BIOS; case VIR_DOMAIN_OS_DEF_FIRMWARE_EFI: + case VIR_DOMAIN_OS_DEF_FIRMWARE_GENERIC: return QEMU_FIRMWARE_OS_INTERFACE_UEFI; case VIR_DOMAIN_OS_DEF_FIRMWARE_NONE: case VIR_DOMAIN_OS_DEF_FIRMWARE_LAST: @@ -932,6 +993,7 @@ qemuFirmwareMatchDomain(const virDomainDef *def, bool supportsSEVES =3D false; bool supportsSecureBoot =3D false; bool hasEnrolledKeys =3D false; + bool supportsTDX =3D false; int reqSecureBoot; int reqEnrolledKeys; =20 @@ -995,6 +1057,10 @@ qemuFirmwareMatchDomain(const virDomainDef *def, hasEnrolledKeys =3D true; break; =20 + case QEMU_FIRMWARE_FEATURE_INTEL_TDX: + supportsTDX =3D true; + break; + case QEMU_FIRMWARE_FEATURE_VERBOSE_DYNAMIC: case QEMU_FIRMWARE_FEATURE_VERBOSE_STATIC: case QEMU_FIRMWARE_FEATURE_NONE: @@ -1069,8 +1135,14 @@ qemuFirmwareMatchDomain(const virDomainDef *def, return false; } break; - case VIR_DOMAIN_LAUNCH_SECURITY_PV: case VIR_DOMAIN_LAUNCH_SECURITY_TDX: + if (!supportsTDX) { + VIR_DEBUG("Domain requires TDX, firmware '%s' doesn't supp= ort it", + path); + return false; + } + break; + case VIR_DOMAIN_LAUNCH_SECURITY_PV: case VIR_DOMAIN_LAUNCH_SECURITY_NONE: break; case VIR_DOMAIN_LAUNCH_SECURITY_LAST: @@ -1093,6 +1165,7 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver, const qemuFirmwareMappingFlash *flash =3D &fw->mapping.data.flash; const qemuFirmwareMappingKernel *kernel =3D &fw->mapping.data.kernel; const qemuFirmwareMappingMemory *memory =3D &fw->mapping.data.memory; + const qemuFirmwareMappingGeneric *generic =3D &fw->mapping.data.generi= c; size_t i; =20 switch (fw->mapping.device) { @@ -1149,6 +1222,17 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver, def->os.loader->path); break; =20 + case QEMU_FIRMWARE_DEVICE_GENERIC: + if (!def->os.loader) + def->os.loader =3D g_new0(virDomainLoaderDef, 1); + + def->os.loader->type =3D VIR_DOMAIN_LOADER_TYPE_GENERIC; + def->os.loader->path =3D g_strdup(generic->filename); + + VIR_DEBUG("decided on loader '%s'", + def->os.loader->path); + break; + case QEMU_FIRMWARE_DEVICE_NONE: case QEMU_FIRMWARE_DEVICE_LAST: break; @@ -1183,6 +1267,7 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver, case QEMU_FIRMWARE_FEATURE_SECURE_BOOT: case QEMU_FIRMWARE_FEATURE_VERBOSE_DYNAMIC: case QEMU_FIRMWARE_FEATURE_VERBOSE_STATIC: + case QEMU_FIRMWARE_FEATURE_INTEL_TDX: case QEMU_FIRMWARE_FEATURE_LAST: break; } @@ -1216,6 +1301,7 @@ qemuFirmwareSanityCheck(const qemuFirmware *fw, case QEMU_FIRMWARE_FEATURE_ENROLLED_KEYS: case QEMU_FIRMWARE_FEATURE_VERBOSE_DYNAMIC: case QEMU_FIRMWARE_FEATURE_VERBOSE_STATIC: + case QEMU_FIRMWARE_FEATURE_INTEL_TDX: case QEMU_FIRMWARE_FEATURE_LAST: break; } @@ -1411,6 +1497,7 @@ qemuFirmwareGetSupported(const char *machine, qemuFirmware *fw =3D firmwares[i]; const qemuFirmwareMappingFlash *flash =3D &fw->mapping.data.flash; const qemuFirmwareMappingMemory *memory =3D &fw->mapping.data.memo= ry; + const qemuFirmwareMappingGeneric *generic =3D &fw->mapping.data.ge= neric; const char *fwpath =3D NULL; const char *nvrampath =3D NULL; size_t j; @@ -1421,7 +1508,10 @@ qemuFirmwareGetSupported(const char *machine, for (j =3D 0; j < fw->ninterfaces; j++) { switch (fw->interfaces[j]) { case QEMU_FIRMWARE_OS_INTERFACE_UEFI: - *supported |=3D 1ULL << VIR_DOMAIN_OS_DEF_FIRMWARE_EFI; + if (fw->mapping.device =3D=3D QEMU_FIRMWARE_DEVICE_GENERIC) + *supported |=3D 1ULL << VIR_DOMAIN_OS_DEF_FIRMWARE_GEN= ERIC; + else + *supported |=3D 1ULL << VIR_DOMAIN_OS_DEF_FIRMWARE_EFI; break; case QEMU_FIRMWARE_OS_INTERFACE_BIOS: *supported |=3D 1ULL << VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS; @@ -1449,6 +1539,7 @@ qemuFirmwareGetSupported(const char *machine, case QEMU_FIRMWARE_FEATURE_SECURE_BOOT: case QEMU_FIRMWARE_FEATURE_VERBOSE_DYNAMIC: case QEMU_FIRMWARE_FEATURE_VERBOSE_STATIC: + case QEMU_FIRMWARE_FEATURE_INTEL_TDX: case QEMU_FIRMWARE_FEATURE_LAST: break; } @@ -1464,6 +1555,10 @@ qemuFirmwareGetSupported(const char *machine, fwpath =3D memory->filename; break; =20 + case QEMU_FIRMWARE_DEVICE_GENERIC: + fwpath =3D generic->filename; + break; + case QEMU_FIRMWARE_DEVICE_KERNEL: case QEMU_FIRMWARE_DEVICE_NONE: case QEMU_FIRMWARE_DEVICE_LAST: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 2cb05dc5b2..ca507868ad 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1254,6 +1254,13 @@ qemuValidateDomainDef(const virDomainDef *def, _("INTEL TDX launch security needs split ke= rnel irqchip")); return -1; } + if ((!def->os.loader || + def->os.loader->type !=3D VIR_DOMAIN_LOADER_TYPE_GENERIC) = && + def->os.firmware !=3D VIR_DOMAIN_OS_DEF_FIRMWARE_GENERIC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("INTEL TDX launch security needs generic = loader type")); + return -1; + } break; case VIR_DOMAIN_LAUNCH_SECURITY_NONE: break; --=20 2.25.1