b585ec0abd
- kvm-introduce-pc_rhel_9_5_compat.patch [RHEL-39544] - kvm-target-i386-add-guest-phys-bits-cpu-property.patch [RHEL-39544] - kvm-kvm-add-support-for-guest-physical-bits.patch [RHEL-39544] - kvm-i386-kvm-Move-architectural-CPUID-leaf-generation-to.patch [RHEL-39544] - kvm-target-i386-Introduce-Icelake-Server-v7-to-enable-TS.patch [RHEL-39544] - kvm-target-i386-Add-new-CPU-model-SierraForest.patch [RHEL-39544] - kvm-target-i386-Export-RFDS-bit-to-guests.patch [RHEL-39544] - kvm-pci-host-q35-Move-PAM-initialization-above-SMRAM-ini.patch [RHEL-39544] - kvm-q35-Introduce-smm_ranges-property-for-q35-pci-host.patch [RHEL-39544] - kvm-hw-i386-acpi-Set-PCAT_COMPAT-bit-only-when-pic-is-no.patch [RHEL-39544] - kvm-confidential-guest-support-Add-kvm_init-and-kvm_rese.patch [RHEL-39544] - kvm-i386-sev-Switch-to-use-confidential_guest_kvm_init.patch [RHEL-39544] - kvm-ppc-pef-switch-to-use-confidential_guest_kvm_init-re.patch [RHEL-39544] - kvm-s390-Switch-to-use-confidential_guest_kvm_init.patch [RHEL-39544] - kvm-scripts-update-linux-headers-Add-setup_data.h-to-imp.patch [RHEL-39544] - kvm-scripts-update-linux-headers-Add-bits.h-to-file-impo.patch [RHEL-39544] - kvm-linux-headers-update-to-current-kvm-next.patch [RHEL-39544] - kvm-runstate-skip-initial-CPU-reset-if-reset-is-not-actu.patch [RHEL-39544] - kvm-KVM-track-whether-guest-state-is-encrypted.patch [RHEL-39544] - kvm-KVM-remove-kvm_arch_cpu_check_are_resettable.patch [RHEL-39544] - kvm-target-i386-introduce-x86-confidential-guest.patch [RHEL-39544] - kvm-target-i386-Implement-mc-kvm_type-to-get-VM-type.patch [RHEL-39544] - kvm-target-i386-SEV-use-KVM_SEV_INIT2-if-possible.patch [RHEL-39544] - kvm-i386-sev-Add-legacy-vm-type-parameter-for-SEV-guest-.patch [RHEL-39544] - kvm-hw-i386-sev-Use-legacy-SEV-VM-types-for-older-machin.patch [RHEL-39544] - kvm-trace-kvm-Split-address-space-and-slot-id-in-trace_k.patch [RHEL-39544] - kvm-kvm-Introduce-support-for-memory_attributes.patch [RHEL-39544] - kvm-RAMBlock-Add-support-of-KVM-private-guest-memfd.patch [RHEL-39544] - kvm-kvm-Enable-KVM_SET_USER_MEMORY_REGION2-for-memslot.patch [RHEL-39544] - kvm-kvm-memory-Make-memory-type-private-by-default-if-it.patch [RHEL-39544] - kvm-HostMem-Add-mechanism-to-opt-in-kvm-guest-memfd-via-.patch [RHEL-39544] - kvm-RAMBlock-make-guest_memfd-require-uncoordinated-disc.patch [RHEL-39544] - kvm-physmem-Introduce-ram_block_discard_guest_memfd_rang.patch [RHEL-39544] - kvm-kvm-handle-KVM_EXIT_MEMORY_FAULT.patch [RHEL-39544] - kvm-kvm-tdx-Don-t-complain-when-converting-vMMIO-region-.patch [RHEL-39544] - kvm-kvm-tdx-Ignore-memory-conversion-to-shared-of-unassi.patch [RHEL-39544] - kvm-hw-i386-x86-Eliminate-two-if-statements-in-x86_bios_.patch [RHEL-39544] - kvm-hw-i386-Have-x86_bios_rom_init-take-X86MachineState-.patch [RHEL-39544] - kvm-hw-i386-pc_sysfw-Remove-unused-parameter-from-pc_isa.patch [RHEL-39544] - kvm-hw-i386-x86-Don-t-leak-isa-bios-memory-regions.patch [RHEL-39544] - kvm-hw-i386-x86-Don-t-leak-pc.bios-memory-region.patch [RHEL-39544] - kvm-hw-i386-x86-Extract-x86_isa_bios_init-from-x86_bios_.patch [RHEL-39544] - kvm-hw-i386-pc_sysfw-Alias-rather-than-copy-isa-bios-reg.patch [RHEL-39544] - kvm-i386-correctly-select-code-in-hw-i386-that-depends-o.patch [RHEL-39544] - kvm-i386-pc-remove-unnecessary-MachineClass-overrides.patch [RHEL-39544] - kvm-hw-i386-split-x86.c-in-multiple-parts.patch [RHEL-39544] - kvm-scripts-update-linux-header.sh-be-more-src-tree-frie.patch [RHEL-39544] - kvm-scripts-update-linux-headers.sh-Remove-temporary-dir.patch [RHEL-39544] - kvm-scripts-update-linux-headers.sh-Fix-the-path-of-setu.patch [RHEL-39544] - kvm-update-linux-headers-fix-forwarding-to-asm-generic-h.patch [RHEL-39544] - kvm-update-linux-headers-move-pvpanic.h-to-correct-direc.patch [RHEL-39544] - kvm-linux-headers-Update-to-current-kvm-next.patch [RHEL-39544] - kvm-update-linux-headers-import-linux-kvm_para.h-header.patch [RHEL-39544] - kvm-machine-allow-early-use-of-machine_require_guest_mem.patch [RHEL-39544] - kvm-i386-sev-Replace-error_report-with-error_setg.patch [RHEL-39544] - kvm-i386-sev-Introduce-sev-common-type-to-encapsulate-co.patch [RHEL-39544] - kvm-i386-sev-Move-sev_launch_update-to-separate-class-me.patch [RHEL-39544] - kvm-i386-sev-Move-sev_launch_finish-to-separate-class-me.patch [RHEL-39544] - kvm-i386-sev-Introduce-sev-snp-guest-object.patch [RHEL-39544] - kvm-i386-sev-Add-a-sev_snp_enabled-helper.patch [RHEL-39544] - kvm-i386-sev-Add-sev_kvm_init-override-for-SEV-class.patch [RHEL-39544] - kvm-i386-sev-Add-snp_kvm_init-override-for-SNP-class.patch [RHEL-39544] - kvm-i386-cpu-Set-SEV-SNP-CPUID-bit-when-SNP-enabled.patch [RHEL-39544] - kvm-i386-sev-Don-t-return-launch-measurements-for-SEV-SN.patch [RHEL-39544] - kvm-i386-sev-Add-a-class-method-to-determine-KVM-VM-type.patch [RHEL-39544] - kvm-i386-sev-Update-query-sev-QAPI-format-to-handle-SEV-.patch [RHEL-39544] - kvm-i386-sev-Add-the-SNP-launch-start-context.patch [RHEL-39544] - kvm-i386-sev-Add-handling-to-encrypt-finalize-guest-laun.patch [RHEL-39544] - kvm-i386-sev-Set-CPU-state-to-protected-once-SNP-guest-p.patch [RHEL-39544] - kvm-hw-i386-sev-Add-function-to-get-SEV-metadata-from-OV.patch [RHEL-39544] - kvm-i386-sev-Add-support-for-populating-OVMF-metadata-pa.patch [RHEL-39544] - kvm-i386-sev-Add-support-for-SNP-CPUID-validation.patch [RHEL-39544] - kvm-hw-i386-sev-Add-support-to-encrypt-BIOS-when-SEV-SNP.patch [RHEL-39544] - kvm-i386-sev-Invoke-launch_updata_data-for-SEV-class.patch [RHEL-39544] - kvm-i386-sev-Invoke-launch_updata_data-for-SNP-class.patch [RHEL-39544] - kvm-i386-kvm-Add-KVM_EXIT_HYPERCALL-handling-for-KVM_HC_.patch [RHEL-39544] - kvm-i386-sev-Enable-KVM_HC_MAP_GPA_RANGE-hcall-for-SNP-g.patch [RHEL-39544] - kvm-i386-sev-Extract-build_kernel_loader_hashes.patch [RHEL-39544] - kvm-i386-sev-Reorder-struct-declarations.patch [RHEL-39544] - kvm-i386-sev-Allow-measured-direct-kernel-boot-on-SNP.patch [RHEL-39544] - kvm-memory-Introduce-memory_region_init_ram_guest_memfd.patch [RHEL-39544] - kvm-hw-i386-sev-Use-guest_memfd-for-legacy-ROMs.patch [RHEL-39544] - kvm-hw-i386-Add-support-for-loading-BIOS-using-guest_mem.patch [RHEL-39544] - kvm-i386-sev-fix-unreachable-code-coverity-issue.patch [RHEL-39544] - kvm-i386-sev-Move-SEV_COMMON-null-check-before-dereferen.patch [RHEL-39544] - kvm-i386-sev-Return-when-sev_common-is-null.patch [RHEL-39544] - kvm-target-i386-SEV-fix-formatting-of-CPUID-mismatch-mes.patch [RHEL-39544] - kvm-i386-sev-Fix-error-message-in-sev_get_capabilities.patch [RHEL-39544] - kvm-i386-sev-Fallback-to-the-default-SEV-device-if-none-.patch [RHEL-39544] - kvm-i386-sev-Don-t-allow-automatic-fallback-to-legacy-KV.patch [RHEL-39544] - kvm-target-i386-SEV-fix-mismatch-in-vcek-disabled-proper.patch [RHEL-39544] - kvm-virtio-rng-block-max-bytes-0.patch [RHEL-50336] - kvm-scsi-disk-Use-positive-return-value-for-status-in-dm.patch [RHEL-50000] - kvm-scsi-block-Don-t-skip-callback-for-sgio-error-status.patch [RHEL-50000] - kvm-scsi-disk-Add-warning-comments-that-host_status-erro.patch [RHEL-50000] - kvm-scsi-disk-Always-report-RESERVATION_CONFLICT-to-gues.patch [RHEL-50000] - kvm-nbd-server-Plumb-in-new-args-to-nbd_client_add.patch [RHEL-52617] - kvm-nbd-server-CVE-2024-7409-Cap-default-max-connections.patch [RHEL-52617] - kvm-nbd-server-CVE-2024-7409-Drop-non-negotiating-client.patch [RHEL-52617] - kvm-nbd-server-CVE-2024-7409-Close-stray-clients-at-serv.patch [RHEL-52617] - Resolves: RHEL-39544 ([QEMU] Add support for AMD SEV-SNP to Qemu) - Resolves: RHEL-50336 (Fail to boot up the guest including vtpm and virtio-rng (max-bytes=0) devices) - Resolves: RHEL-50000 (scsi-block: Cannot setup Windows Failover Cluster, qemu crashes on assert) - Resolves: RHEL-52617 (CVE-2024-7409 qemu-kvm: Denial of Service via Improper Synchronization in QEMU NBD Server During Socket Closure [rhel-9.5])
159 lines
5.5 KiB
Diff
159 lines
5.5 KiB
Diff
From e6472ff46cbed97c2a238a8ef7d321351931333a Mon Sep 17 00:00:00 2001
|
|
From: Brijesh Singh <brijesh.singh@amd.com>
|
|
Date: Thu, 30 May 2024 06:16:30 -0500
|
|
Subject: [PATCH 070/100] hw/i386/sev: Add function to get SEV metadata from
|
|
OVMF header
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 245: SEV-SNP support
|
|
RH-Jira: RHEL-39544
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Bandan Das <bdas@redhat.com>
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
RH-Commit: [70/91] ba818dade96119c8a51ca1fb222f4f69e2752396 (bonzini/rhel-qemu-kvm)
|
|
|
|
A recent version of OVMF expanded the reset vector GUID list to add
|
|
SEV-specific metadata GUID. The SEV metadata describes the reserved
|
|
memory regions such as the secrets and CPUID page used during the SEV-SNP
|
|
guest launch.
|
|
|
|
The pc_system_get_ovmf_sev_metadata_ptr() is used to retieve the SEV
|
|
metadata pointer from the OVMF GUID list.
|
|
|
|
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
|
|
Signed-off-by: Michael Roth <michael.roth@amd.com>
|
|
Signed-off-by: Pankaj Gupta <pankaj.gupta@amd.com>
|
|
Message-ID: <20240530111643.1091816-19-pankaj.gupta@amd.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit f3c30c575d34122573b7370a7da5ca3a27dde481)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
hw/i386/pc_sysfw.c | 4 ++++
|
|
include/hw/i386/pc.h | 26 ++++++++++++++++++++++++++
|
|
target/i386/sev-sysemu-stub.c | 4 ++++
|
|
target/i386/sev.c | 32 ++++++++++++++++++++++++++++++++
|
|
target/i386/sev.h | 2 ++
|
|
5 files changed, 68 insertions(+)
|
|
|
|
diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
|
|
index ac88ad4eb9..9b8671c441 100644
|
|
--- a/hw/i386/pc_sysfw.c
|
|
+++ b/hw/i386/pc_sysfw.c
|
|
@@ -260,6 +260,10 @@ void x86_firmware_configure(void *ptr, int size)
|
|
pc_system_parse_ovmf_flash(ptr, size);
|
|
|
|
if (sev_enabled()) {
|
|
+
|
|
+ /* Copy the SEV metadata table (if it exists) */
|
|
+ pc_system_parse_sev_metadata(ptr, size);
|
|
+
|
|
ret = sev_es_save_reset_vector(ptr, size);
|
|
if (ret) {
|
|
error_report("failed to locate and/or save reset vector");
|
|
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
|
|
index 3f53ec73ac..94b49310f5 100644
|
|
--- a/include/hw/i386/pc.h
|
|
+++ b/include/hw/i386/pc.h
|
|
@@ -167,6 +167,32 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level);
|
|
#define PCI_HOST_ABOVE_4G_MEM_SIZE "above-4g-mem-size"
|
|
#define PCI_HOST_PROP_SMM_RANGES "smm-ranges"
|
|
|
|
+typedef enum {
|
|
+ SEV_DESC_TYPE_UNDEF,
|
|
+ /* The section contains the region that must be validated by the VMM. */
|
|
+ SEV_DESC_TYPE_SNP_SEC_MEM,
|
|
+ /* The section contains the SNP secrets page */
|
|
+ SEV_DESC_TYPE_SNP_SECRETS,
|
|
+ /* The section contains address that can be used as a CPUID page */
|
|
+ SEV_DESC_TYPE_CPUID,
|
|
+
|
|
+} ovmf_sev_metadata_desc_type;
|
|
+
|
|
+typedef struct __attribute__((__packed__)) OvmfSevMetadataDesc {
|
|
+ uint32_t base;
|
|
+ uint32_t len;
|
|
+ ovmf_sev_metadata_desc_type type;
|
|
+} OvmfSevMetadataDesc;
|
|
+
|
|
+typedef struct __attribute__((__packed__)) OvmfSevMetadata {
|
|
+ uint8_t signature[4];
|
|
+ uint32_t len;
|
|
+ uint32_t version;
|
|
+ uint32_t num_desc;
|
|
+ OvmfSevMetadataDesc descs[];
|
|
+} OvmfSevMetadata;
|
|
+
|
|
+OvmfSevMetadata *pc_system_get_ovmf_sev_metadata_ptr(void);
|
|
|
|
void pc_pci_as_mapping_init(MemoryRegion *system_memory,
|
|
MemoryRegion *pci_address_space);
|
|
diff --git a/target/i386/sev-sysemu-stub.c b/target/i386/sev-sysemu-stub.c
|
|
index 96e1c15cc3..fc1c57c411 100644
|
|
--- a/target/i386/sev-sysemu-stub.c
|
|
+++ b/target/i386/sev-sysemu-stub.c
|
|
@@ -67,3 +67,7 @@ void hmp_info_sev(Monitor *mon, const QDict *qdict)
|
|
{
|
|
monitor_printf(mon, "SEV is not available in this QEMU\n");
|
|
}
|
|
+
|
|
+void pc_system_parse_sev_metadata(uint8_t *flash_ptr, size_t flash_size)
|
|
+{
|
|
+}
|
|
diff --git a/target/i386/sev.c b/target/i386/sev.c
|
|
index e84e4395a5..17281bb2c7 100644
|
|
--- a/target/i386/sev.c
|
|
+++ b/target/i386/sev.c
|
|
@@ -597,6 +597,38 @@ SevCapability *qmp_query_sev_capabilities(Error **errp)
|
|
return sev_get_capabilities(errp);
|
|
}
|
|
|
|
+static OvmfSevMetadata *ovmf_sev_metadata_table;
|
|
+
|
|
+#define OVMF_SEV_META_DATA_GUID "dc886566-984a-4798-A75e-5585a7bf67cc"
|
|
+typedef struct __attribute__((__packed__)) OvmfSevMetadataOffset {
|
|
+ uint32_t offset;
|
|
+} OvmfSevMetadataOffset;
|
|
+
|
|
+OvmfSevMetadata *pc_system_get_ovmf_sev_metadata_ptr(void)
|
|
+{
|
|
+ return ovmf_sev_metadata_table;
|
|
+}
|
|
+
|
|
+void pc_system_parse_sev_metadata(uint8_t *flash_ptr, size_t flash_size)
|
|
+{
|
|
+ OvmfSevMetadata *metadata;
|
|
+ OvmfSevMetadataOffset *data;
|
|
+
|
|
+ if (!pc_system_ovmf_table_find(OVMF_SEV_META_DATA_GUID, (uint8_t **)&data,
|
|
+ NULL)) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ metadata = (OvmfSevMetadata *)(flash_ptr + flash_size - data->offset);
|
|
+ if (memcmp(metadata->signature, "ASEV", 4) != 0 ||
|
|
+ metadata->len < sizeof(OvmfSevMetadata) ||
|
|
+ metadata->len > flash_size - data->offset) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ ovmf_sev_metadata_table = g_memdup2(metadata, metadata->len);
|
|
+}
|
|
+
|
|
static SevAttestationReport *sev_get_attestation_report(const char *mnonce,
|
|
Error **errp)
|
|
{
|
|
diff --git a/target/i386/sev.h b/target/i386/sev.h
|
|
index 5dc4767b1e..cc12824dd6 100644
|
|
--- a/target/i386/sev.h
|
|
+++ b/target/i386/sev.h
|
|
@@ -66,4 +66,6 @@ int sev_inject_launch_secret(const char *hdr, const char *secret,
|
|
int sev_es_save_reset_vector(void *flash_ptr, uint64_t flash_size);
|
|
void sev_es_set_reset_vector(CPUState *cpu);
|
|
|
|
+void pc_system_parse_sev_metadata(uint8_t *flash_ptr, size_t flash_size);
|
|
+
|
|
#endif
|
|
--
|
|
2.39.3
|
|
|