4f059b938c
- hw/loongarch/virt: Fix FDT memory node address width - hw/loongarch: Fix fdt memory node wrong 'reg' - load_elf: fix iterator's type for elf file processing - migration/colo: Fix bdrv_graph_rdlock_main_loop: Assertion `!qemu_in_… - target/i386: no single-step exception after MOV or POP SS - char-stdio: Restore blocking mode of stdout on exit - backends/cryptodev-builtin: Fix local_error leaks - target/loongarch: fix a wrong print in cpu dump - virtio-pci: fix use of a released vector - target/arm: Disable SVE extensions when SVE is disabled - hw/misc/bcm2835_property: Fix handling of FRAMEBUFFER_SET_PALETTE - target/i386: Introduce SapphireRapids-v3 to add missing features - virtio-net: Ensure queue index fits with RSS (CVE-2024-6505) - nbd/server: CVE-2024-7409: Avoid use-after-free when closing server - update io/trace-events. Parameters should remain consistent. - update docs/tools/virtfs-proxy-helper.rst. This place is spelled wrong. - kvm: Add support for CSV2 reboot - target/i386/kvm: Fix the resettable info when emulate Hygon CSV2 guest - target/i386: get/set/migrate GHCB state - target/i386: csv: Add support for migrate VMSA for CSV2 guest - migration/ram: Accelerate the loading of CSV guest's encrypted pages - migration/ram: Accelerate the transmission of CSV guest's encrypted pages - target/i386: csv: add support to load incoming encrypted pages queued in the CMD list - target/i386: csv: add support to queue the incoming page into a list - target/i386: csv: add support to encrypt the outgoing pages in the list queued before. - target/i386: csv: add support to queue the outgoing page into a list - target/i386: csv: Read cert chain from file when prepared for CSV live migration - target/i386: Introduce header file csv.h - migration/ram: Fix calculation of gfn correpond to a page in ramblock - target/i386: sev: Clear shared_regions_list when reboot CSV Guest - migration/ram: Force encrypted status for VGA vram - target/i386: sev: Return 0 if sev_send_get_packet_len() fails - kvm: Add support for userspace MSR filtering and handling of MSR_KVM_MIGRATION_CONTROL. - migration/ram: Force encrypted status for flash0 & flash1 devices. - migration/ram: add support to send encrypted pages - migration: add support to migrate shared regions list - kvm: Add support for SEV shared regions list and KVM_EXIT_HYPERCALL. - target/i386: sev: add support to load incoming encrypted page - target/i386: sev: add support to encrypt the outgoing page - target/i386: sev: do not create launch context for an incoming guest - target/i386: sev: provide callback to setup outgoing context - confidential guest support: introduce ConfidentialGuestMemoryEncryptionOps for encrypted VMs - migration.json: add AMD SEV specific migration parameters - doc: update AMD SEV to include Live migration flow - crypto/tlscredspsk: Free username on finalize - hw/nvme: fix leak of uninitialized memory in io_mgmt_recv - hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read() - cvm : Implement command blacklist for cvm security enhancement - crypto: Introduce SM3 hash hmac pbkdf algorithm - virtio-net: Use virtual time for RSC timers - vvfat: Fix bug in writing to middle of file - hw/core/ptimer: fix timer zero period condition for freq > 1GHz - hw/misc: support vpsp Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
From ec2518709b8d461c3a165c1722ccd2e585cec161 Mon Sep 17 00:00:00 2001
|
|
From: hanliyang <hanliyang@hygon.cn>
|
|
Date: Sun, 16 Jan 2022 20:05:02 -0500
|
|
Subject: [PATCH] migration/ram: Fix calculation of gfn correpond to a page in
|
|
ramblock
|
|
|
|
A RAMBlock contains a host memory region which may consist of many
|
|
discontiguous MemoryRegion in AddressSpace of a Guest, so we cannot
|
|
get gpa by MemoryRegion.addr. Since KVM memslot records the relationship
|
|
between gpa and hva, so we can pass the hva of page in RAMBlock to
|
|
kvm_phisical_memory_addr_from_host() to get the expected gpa.
|
|
|
|
Signed-off-by: hanliyang <hanliyang@hygon.cn>
|
|
---
|
|
migration/ram.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/migration/ram.c b/migration/ram.c
|
|
index 66a36736ad..1abe8476f7 100644
|
|
--- a/migration/ram.c
|
|
+++ b/migration/ram.c
|
|
@@ -67,6 +67,7 @@
|
|
|
|
/* Defines RAM_SAVE_ENCRYPTED_PAGE and RAM_SAVE_SHARED_REGION_LIST */
|
|
#include "target/i386/sev.h"
|
|
+#include "sysemu/kvm.h"
|
|
|
|
#include "hw/boards.h" /* for machine_dump_guest_core() */
|
|
|
|
@@ -2145,6 +2146,8 @@ static bool encrypted_test_list(RAMState *rs, RAMBlock *block,
|
|
struct ConfidentialGuestMemoryEncryptionOps *ops =
|
|
cgs_class->memory_encryption_ops;
|
|
unsigned long gfn;
|
|
+ hwaddr paddr = 0;
|
|
+ int ret;
|
|
|
|
/* ROM devices contains the unencrypted data */
|
|
if (memory_region_is_rom(block->mr)) {
|
|
@@ -2167,7 +2170,14 @@ static bool encrypted_test_list(RAMState *rs, RAMBlock *block,
|
|
* Translate page in ram_addr_t address space to GPA address
|
|
* space using memory region.
|
|
*/
|
|
- gfn = page + (block->mr->addr >> TARGET_PAGE_BITS);
|
|
+ if (kvm_enabled()) {
|
|
+ ret = kvm_physical_memory_addr_from_host(kvm_state,
|
|
+ block->host + (page << TARGET_PAGE_BITS), &paddr);
|
|
+ if (ret == 0) {
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+ gfn = paddr >> TARGET_PAGE_BITS;
|
|
|
|
return ops->is_gfn_in_unshared_region(gfn);
|
|
}
|
|
--
|
|
2.41.0.windows.1
|
|
|