From nobody Thu Sep 19 00:58:16 2024 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; 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=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1718882968469151.63764510795215; Thu, 20 Jun 2024 04:29:28 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6CA83CAB; Thu, 20 Jun 2024 07:29:27 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A5C5012D8; Thu, 20 Jun 2024 07:23:34 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 08D4B1249; Thu, 20 Jun 2024 07:23:29 -0400 (EDT) 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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 77F74E30 for ; Thu, 20 Jun 2024 07:23:09 -0400 (EDT) Received: from mx-prod-mc-04.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-359-n3-Ajmq9MVa3R17U8vg3tg-1; Thu, 20 Jun 2024 07:23:07 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1466019560BA for ; Thu, 20 Jun 2024 11:23:07 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4FCE81955F2D for ; Thu, 20 Jun 2024 11:23:06 +0000 (UTC) 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_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718882589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lux9Ml3sMcBZFy+Y/67YvF14phhyvYyr5mNAwV57Lqw=; b=dEtLF9Fr/qaDFswlSmVEt15pzK1jqoaBlFKJXpRtgc3A3Q417/Cbrsg98uzQfYW0e3RlIo D0tPMy56hDR9SNVgerteaKFWp5p0CrTOV4Py8+dxAHwv8/l+SCEXhkgTJeR5xjEYONvfhD DxMIKcmQivnOCbLEoetso4SwszmAI7Y= X-MC-Unique: n3-Ajmq9MVa3R17U8vg3tg-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 12/12] qemu_firmware: Pick the right firmware for SEV-SNP guests Date: Thu, 20 Jun 2024 13:22:49 +0200 Message-ID: <6287f0236fefefb1fffbe4769115a20387a97695.1718882351.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CNP7QY25A7HK6ICIQ3HYHA2ZSEVB6NGM X-Message-ID-Hash: CNP7QY25A7HK6ICIQ3HYHA2ZSEVB6NGM X-MailFrom: mprivozn@redhat.com 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header 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: 1718882970918100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The firmware descriptors have 'amd-sev-snp` feature which describes whether firmware is suitable for SEV-SNP guests. Provide necessary implementation to detect the feature and pick the right firmware if guest is SEV-SNP enabled. Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_firmware.c | 15 +++++++++++++++ .../qemu/firmware/60-edk2-ovmf-x64-amdsev.json | 1 + 2 files changed, 16 insertions(+) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 262eeecc5c..424b0b3217 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -148,6 +148,7 @@ typedef enum { QEMU_FIRMWARE_FEATURE_ACPI_S4, QEMU_FIRMWARE_FEATURE_AMD_SEV, QEMU_FIRMWARE_FEATURE_AMD_SEV_ES, + QEMU_FIRMWARE_FEATURE_AMD_SEV_SNP, QEMU_FIRMWARE_FEATURE_ENROLLED_KEYS, QEMU_FIRMWARE_FEATURE_REQUIRES_SMM, QEMU_FIRMWARE_FEATURE_SECURE_BOOT, @@ -165,6 +166,7 @@ VIR_ENUM_IMPL(qemuFirmwareFeature, "acpi-s4", "amd-sev", "amd-sev-es", + "amd-sev-snp", "enrolled-keys", "requires-smm", "secure-boot", @@ -1148,6 +1150,7 @@ qemuFirmwareMatchDomain(const virDomainDef *def, bool requiresSMM =3D false; bool supportsSEV =3D false; bool supportsSEVES =3D false; + bool supportsSEVSNP =3D false; bool supportsSecureBoot =3D false; bool hasEnrolledKeys =3D false; int reqSecureBoot; @@ -1195,6 +1198,10 @@ qemuFirmwareMatchDomain(const virDomainDef *def, supportsSEVES =3D true; break; =20 + case QEMU_FIRMWARE_FEATURE_AMD_SEV_SNP: + supportsSEVSNP =3D true; + break; + case QEMU_FIRMWARE_FEATURE_REQUIRES_SMM: requiresSMM =3D true; break; @@ -1340,6 +1347,11 @@ qemuFirmwareMatchDomain(const virDomainDef *def, break; =20 case VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP: + if (!supportsSEVSNP) { + VIR_DEBUG("Domain requires SEV-SNP firmware '%s' doesn't s= upport it", + path); + return false; + } break; case VIR_DOMAIN_LAUNCH_SECURITY_PV: break; @@ -1451,6 +1463,7 @@ qemuFirmwareEnableFeaturesModern(virDomainDef *def, case QEMU_FIRMWARE_FEATURE_ACPI_S4: case QEMU_FIRMWARE_FEATURE_AMD_SEV: case QEMU_FIRMWARE_FEATURE_AMD_SEV_ES: + case QEMU_FIRMWARE_FEATURE_AMD_SEV_SNP: case QEMU_FIRMWARE_FEATURE_VERBOSE_DYNAMIC: case QEMU_FIRMWARE_FEATURE_VERBOSE_STATIC: case QEMU_FIRMWARE_FEATURE_NONE: @@ -1501,6 +1514,7 @@ qemuFirmwareSanityCheck(const qemuFirmware *fw, case QEMU_FIRMWARE_FEATURE_ACPI_S4: case QEMU_FIRMWARE_FEATURE_AMD_SEV: case QEMU_FIRMWARE_FEATURE_AMD_SEV_ES: + case QEMU_FIRMWARE_FEATURE_AMD_SEV_SNP: case QEMU_FIRMWARE_FEATURE_VERBOSE_DYNAMIC: case QEMU_FIRMWARE_FEATURE_VERBOSE_STATIC: case QEMU_FIRMWARE_FEATURE_LAST: @@ -1935,6 +1949,7 @@ qemuFirmwareGetSupported(const char *machine, case QEMU_FIRMWARE_FEATURE_ACPI_S4: case QEMU_FIRMWARE_FEATURE_AMD_SEV: case QEMU_FIRMWARE_FEATURE_AMD_SEV_ES: + case QEMU_FIRMWARE_FEATURE_AMD_SEV_SNP: 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-amdsev.json b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-e= dk2-ovmf-x64-amdsev.json index 2d3b821acb..d83d394ba7 100644 --- a/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovmf-x64-a= mdsev.json +++ b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovmf-x64-a= mdsev.json @@ -21,6 +21,7 @@ "features": [ "amd-sev", "amd-sev-es", + "amd-sev-snp", "verbose-dynamic" ] } --=20 2.44.2