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])
195 lines
7.1 KiB
Diff
195 lines
7.1 KiB
Diff
From 33cc1b469689ee2bb7c4f745189472c74a0a98ab Mon Sep 17 00:00:00 2001
|
|
From: Chao Peng <chao.p.peng@linux.intel.com>
|
|
Date: Wed, 20 Mar 2024 03:39:08 -0500
|
|
Subject: [PATCH 034/100] kvm: handle KVM_EXIT_MEMORY_FAULT
|
|
|
|
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: [34/91] 59c672f6b19a3afcb61878775eb6425c6fdea6d5 (bonzini/rhel-qemu-kvm)
|
|
|
|
Upon an KVM_EXIT_MEMORY_FAULT exit, userspace needs to do the memory
|
|
conversion on the RAMBlock to turn the memory into desired attribute,
|
|
switching between private and shared.
|
|
|
|
Currently only KVM_MEMORY_EXIT_FLAG_PRIVATE in flags is valid when
|
|
KVM_EXIT_MEMORY_FAULT happens.
|
|
|
|
Note, KVM_EXIT_MEMORY_FAULT makes sense only when the RAMBlock has
|
|
guest_memfd memory backend.
|
|
|
|
Note, KVM_EXIT_MEMORY_FAULT returns with -EFAULT, so special handling is
|
|
added.
|
|
|
|
When page is converted from shared to private, the original shared
|
|
memory can be discarded via ram_block_discard_range(). Note, shared
|
|
memory can be discarded only when it's not back'ed by hugetlb because
|
|
hugetlb is supposed to be pre-allocated and no need for discarding.
|
|
|
|
Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com>
|
|
Co-developed-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
|
|
Message-ID: <20240320083945.991426-13-michael.roth@amd.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit c15e5684071d93174e446be318f49d8d59b15d6d)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
accel/kvm/kvm-all.c | 98 +++++++++++++++++++++++++++++++++++++-----
|
|
accel/kvm/trace-events | 2 +
|
|
include/sysemu/kvm.h | 2 +
|
|
3 files changed, 92 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
|
|
index 3f99efc8cc..09164e346c 100644
|
|
--- a/accel/kvm/kvm-all.c
|
|
+++ b/accel/kvm/kvm-all.c
|
|
@@ -2900,6 +2900,69 @@ static void kvm_eat_signals(CPUState *cpu)
|
|
} while (sigismember(&chkset, SIG_IPI));
|
|
}
|
|
|
|
+int kvm_convert_memory(hwaddr start, hwaddr size, bool to_private)
|
|
+{
|
|
+ MemoryRegionSection section;
|
|
+ ram_addr_t offset;
|
|
+ MemoryRegion *mr;
|
|
+ RAMBlock *rb;
|
|
+ void *addr;
|
|
+ int ret = -1;
|
|
+
|
|
+ trace_kvm_convert_memory(start, size, to_private ? "shared_to_private" : "private_to_shared");
|
|
+
|
|
+ if (!QEMU_PTR_IS_ALIGNED(start, qemu_real_host_page_size()) ||
|
|
+ !QEMU_PTR_IS_ALIGNED(size, qemu_real_host_page_size())) {
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ if (!size) {
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ section = memory_region_find(get_system_memory(), start, size);
|
|
+ mr = section.mr;
|
|
+ if (!mr) {
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ if (!memory_region_has_guest_memfd(mr)) {
|
|
+ error_report("Converting non guest_memfd backed memory region "
|
|
+ "(0x%"HWADDR_PRIx" ,+ 0x%"HWADDR_PRIx") to %s",
|
|
+ start, size, to_private ? "private" : "shared");
|
|
+ goto out_unref;
|
|
+ }
|
|
+
|
|
+ if (to_private) {
|
|
+ ret = kvm_set_memory_attributes_private(start, size);
|
|
+ } else {
|
|
+ ret = kvm_set_memory_attributes_shared(start, size);
|
|
+ }
|
|
+ if (ret) {
|
|
+ goto out_unref;
|
|
+ }
|
|
+
|
|
+ addr = memory_region_get_ram_ptr(mr) + section.offset_within_region;
|
|
+ rb = qemu_ram_block_from_host(addr, false, &offset);
|
|
+
|
|
+ if (to_private) {
|
|
+ if (rb->page_size != qemu_real_host_page_size()) {
|
|
+ /*
|
|
+ * shared memory is backed by hugetlb, which is supposed to be
|
|
+ * pre-allocated and doesn't need to be discarded
|
|
+ */
|
|
+ goto out_unref;
|
|
+ }
|
|
+ ret = ram_block_discard_range(rb, offset, size);
|
|
+ } else {
|
|
+ ret = ram_block_discard_guest_memfd_range(rb, offset, size);
|
|
+ }
|
|
+
|
|
+out_unref:
|
|
+ memory_region_unref(mr);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
int kvm_cpu_exec(CPUState *cpu)
|
|
{
|
|
struct kvm_run *run = cpu->kvm_run;
|
|
@@ -2967,18 +3030,20 @@ int kvm_cpu_exec(CPUState *cpu)
|
|
ret = EXCP_INTERRUPT;
|
|
break;
|
|
}
|
|
- fprintf(stderr, "error: kvm run failed %s\n",
|
|
- strerror(-run_ret));
|
|
+ if (!(run_ret == -EFAULT && run->exit_reason == KVM_EXIT_MEMORY_FAULT)) {
|
|
+ fprintf(stderr, "error: kvm run failed %s\n",
|
|
+ strerror(-run_ret));
|
|
#ifdef TARGET_PPC
|
|
- if (run_ret == -EBUSY) {
|
|
- fprintf(stderr,
|
|
- "This is probably because your SMT is enabled.\n"
|
|
- "VCPU can only run on primary threads with all "
|
|
- "secondary threads offline.\n");
|
|
- }
|
|
+ if (run_ret == -EBUSY) {
|
|
+ fprintf(stderr,
|
|
+ "This is probably because your SMT is enabled.\n"
|
|
+ "VCPU can only run on primary threads with all "
|
|
+ "secondary threads offline.\n");
|
|
+ }
|
|
#endif
|
|
- ret = -1;
|
|
- break;
|
|
+ ret = -1;
|
|
+ break;
|
|
+ }
|
|
}
|
|
|
|
trace_kvm_run_exit(cpu->cpu_index, run->exit_reason);
|
|
@@ -3061,6 +3126,19 @@ int kvm_cpu_exec(CPUState *cpu)
|
|
break;
|
|
}
|
|
break;
|
|
+ case KVM_EXIT_MEMORY_FAULT:
|
|
+ trace_kvm_memory_fault(run->memory_fault.gpa,
|
|
+ run->memory_fault.size,
|
|
+ run->memory_fault.flags);
|
|
+ if (run->memory_fault.flags & ~KVM_MEMORY_EXIT_FLAG_PRIVATE) {
|
|
+ error_report("KVM_EXIT_MEMORY_FAULT: Unknown flag 0x%" PRIx64,
|
|
+ (uint64_t)run->memory_fault.flags);
|
|
+ ret = -1;
|
|
+ break;
|
|
+ }
|
|
+ ret = kvm_convert_memory(run->memory_fault.gpa, run->memory_fault.size,
|
|
+ run->memory_fault.flags & KVM_MEMORY_EXIT_FLAG_PRIVATE);
|
|
+ break;
|
|
default:
|
|
ret = kvm_arch_handle_exit(cpu, run);
|
|
break;
|
|
diff --git a/accel/kvm/trace-events b/accel/kvm/trace-events
|
|
index e8c52cb9e7..681ccb667d 100644
|
|
--- a/accel/kvm/trace-events
|
|
+++ b/accel/kvm/trace-events
|
|
@@ -31,3 +31,5 @@ kvm_cpu_exec(void) ""
|
|
kvm_interrupt_exit_request(void) ""
|
|
kvm_io_window_exit(void) ""
|
|
kvm_run_exit_system_event(int cpu_index, uint32_t event_type) "cpu_index %d, system_even_type %"PRIu32
|
|
+kvm_convert_memory(uint64_t start, uint64_t size, const char *msg) "start 0x%" PRIx64 " size 0x%" PRIx64 " %s"
|
|
+kvm_memory_fault(uint64_t start, uint64_t size, uint64_t flags) "start 0x%" PRIx64 " size 0x%" PRIx64 " flags 0x%" PRIx64
|
|
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
|
|
index 9e4ab7ae89..74f23dff9c 100644
|
|
--- a/include/sysemu/kvm.h
|
|
+++ b/include/sysemu/kvm.h
|
|
@@ -542,4 +542,6 @@ int kvm_create_guest_memfd(uint64_t size, uint64_t flags, Error **errp);
|
|
int kvm_set_memory_attributes_private(hwaddr start, uint64_t size);
|
|
int kvm_set_memory_attributes_shared(hwaddr start, uint64_t size);
|
|
|
|
+int kvm_convert_memory(hwaddr start, hwaddr size, bool to_private);
|
|
+
|
|
#endif
|
|
--
|
|
2.39.3
|
|
|