From nobody Tue Sep 9 19:04:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@intel.com; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1752132516999253.41632949987854; Thu, 10 Jul 2025 00:28:36 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 021861522; Thu, 10 Jul 2025 03:28:35 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 77118153A; Thu, 10 Jul 2025 03:23:08 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 27E5913D2; Thu, 10 Jul 2025 03:22:56 -0400 (EDT) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E5BE2996 for ; Thu, 10 Jul 2025 03:22:34 -0400 (EDT) Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2025 00:22:30 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2025 00:22:27 -0700 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1752132155; x=1783668155; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z9f6LMwgwLjFZoe4kPuk6elcbAYgMHYp8GLRFe1ReQg=; b=MvtTOjP+D4wcpi0UYZCLlbn6Jpra94kLJU3IFqMqgJH1kCbUX9Ew0O6J qqIO1OGC4CmPTaERquK20dhpGsoSJ9qWtZa1cXgeb43fV1k4LJm3W+IXi qy+E7S6L5hHKn14ukrtUbfGblKWbjIa5UgY611ov2NSA1V2PV2vQSt9oc GLAsLLYGVV2638EDUhEuKg3k9IvfdTFCQ6pCdYAhiYRaG+qWUYldOb5ZT NU3VyY4cOxRBWmbpmN8n9ZJft2mGC4VoyNn0wqtX8jXC0NDlLN+UpWXL0 GtWAF5Yj6JvQ0cPye/d31l79dwOUnQXOLjGGS57PKFqTxqQVunR4fXhrE w==; X-CSE-ConnectionGUID: UWc5R42rQ0qe8qYdl99W7Q== X-CSE-MsgGUID: ODDLZK3vQRuirtoJnT+VJw== X-IronPort-AV: E=McAfee;i="6800,10657,11489"; a="54257108" X-IronPort-AV: E=Sophos;i="6.16,300,1744095600"; d="scan'208";a="54257108" X-CSE-ConnectionGUID: 1zuNT8Y1QIuG81pEOxXJVg== X-CSE-MsgGUID: x83FklAHQimnxnFPajLqnw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,300,1744095600"; d="scan'208";a="186997179" From: Zhenzhong Duan To: devel@lists.libvirt.org Subject: [PATCH v4 13/23] qemu_firmware: Pick the right firmware for TDX guests Date: Thu, 10 Jul 2025 03:21:15 -0400 Message-ID: <20250710072127.695558-14-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250710072127.695558-1-zhenzhong.duan@intel.com> References: <20250710072127.695558-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: MYGXFAGUXXI23DBD2FIPHA6QN6644D6H X-Message-ID-Hash: MYGXFAGUXXI23DBD2FIPHA6QN6644D6H X-MailFrom: zhenzhong.duan@intel.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: phrdina@redhat.com, pkrempa@redhat.com, jjongsma@redhat.com, jsuchane@redhat.com, chenyi.qiang@intel.com, isaku.yamahata@intel.com, xiaoyao.li@intel.com, chao.p.peng@intel.com, Zhenzhong Duan X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1752132518386116600 Content-Type: text/plain; charset="utf-8" The firmware descriptors have 'intel-tdx' feature which describes whether firmware is suitable for TDX guests. Provide necessary implementation to detect the feature and pick the right firmware if guest is TDX enabled. Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Zhenzhong Duan Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_firmware.c | 21 ++++++++++++++++++- .../firmware/60-edk2-ovmf-x64-inteltdx.json | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 6c65a2751b..f10137144e 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -149,6 +149,7 @@ typedef enum { QEMU_FIRMWARE_FEATURE_AMD_SEV, QEMU_FIRMWARE_FEATURE_AMD_SEV_ES, QEMU_FIRMWARE_FEATURE_AMD_SEV_SNP, + QEMU_FIRMWARE_FEATURE_INTEL_TDX, QEMU_FIRMWARE_FEATURE_ENROLLED_KEYS, QEMU_FIRMWARE_FEATURE_REQUIRES_SMM, QEMU_FIRMWARE_FEATURE_SECURE_BOOT, @@ -167,6 +168,7 @@ VIR_ENUM_IMPL(qemuFirmwareFeature, "amd-sev", "amd-sev-es", "amd-sev-snp", + "intel-tdx", "enrolled-keys", "requires-smm", "secure-boot", @@ -1158,6 +1160,7 @@ qemuFirmwareMatchDomain(const virDomainDef *def, bool supportsSEV =3D false; bool supportsSEVES =3D false; bool supportsSEVSNP =3D false; + bool supportsTDX =3D false; bool supportsSecureBoot =3D false; bool hasEnrolledKeys =3D false; int reqSecureBoot; @@ -1209,6 +1212,10 @@ qemuFirmwareMatchDomain(const virDomainDef *def, supportsSEVSNP =3D true; break; =20 + case QEMU_FIRMWARE_FEATURE_INTEL_TDX: + supportsTDX =3D true; + break; + case QEMU_FIRMWARE_FEATURE_REQUIRES_SMM: requiresSMM =3D true; break; @@ -1370,9 +1377,18 @@ 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: + break; + case VIR_DOMAIN_LAUNCH_SECURITY_NONE: case VIR_DOMAIN_LAUNCH_SECURITY_LAST: virReportEnumRangeError(virDomainLaunchSecurity, def->sec->sec= type); @@ -1490,6 +1506,7 @@ qemuFirmwareEnableFeaturesModern(virDomainDef *def, case QEMU_FIRMWARE_FEATURE_AMD_SEV: case QEMU_FIRMWARE_FEATURE_AMD_SEV_ES: case QEMU_FIRMWARE_FEATURE_AMD_SEV_SNP: + case QEMU_FIRMWARE_FEATURE_INTEL_TDX: case QEMU_FIRMWARE_FEATURE_VERBOSE_DYNAMIC: case QEMU_FIRMWARE_FEATURE_VERBOSE_STATIC: case QEMU_FIRMWARE_FEATURE_NONE: @@ -1541,6 +1558,7 @@ qemuFirmwareSanityCheck(const qemuFirmware *fw, case QEMU_FIRMWARE_FEATURE_AMD_SEV: case QEMU_FIRMWARE_FEATURE_AMD_SEV_ES: case QEMU_FIRMWARE_FEATURE_AMD_SEV_SNP: + case QEMU_FIRMWARE_FEATURE_INTEL_TDX: case QEMU_FIRMWARE_FEATURE_VERBOSE_DYNAMIC: case QEMU_FIRMWARE_FEATURE_VERBOSE_STATIC: case QEMU_FIRMWARE_FEATURE_LAST: @@ -1981,6 +1999,7 @@ qemuFirmwareGetSupported(const char *machine, case QEMU_FIRMWARE_FEATURE_AMD_SEV: case QEMU_FIRMWARE_FEATURE_AMD_SEV_ES: case QEMU_FIRMWARE_FEATURE_AMD_SEV_SNP: + case QEMU_FIRMWARE_FEATURE_INTEL_TDX: case QEMU_FIRMWARE_FEATURE_ENROLLED_KEYS: case QEMU_FIRMWARE_FEATURE_SECURE_BOOT: case QEMU_FIRMWARE_FEATURE_VERBOSE_DYNAMIC: diff --git a/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovm= f-x64-inteltdx.json b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60= -edk2-ovmf-x64-inteltdx.json index d002ec7386..2630b57b05 100644 --- a/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovmf-x64-i= nteltdx.json +++ b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovmf-x64-i= nteltdx.json @@ -16,6 +16,7 @@ ], "features": [ "enrolled-keys", + "intel-tdx", "secure-boot", "verbose-dynamic" ] --=20 2.47.1