SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration: Avoid SNP guest crash due to duplicate cpr blocker

Browse Source 
With aux-ram-share=off, booting an SNP guest fails with:

  ../util/error.c:68: error_setv: Assertion `*errp == NULL' failed.

This is because a CPR blocker for the guest_memfd ramblock is added
twice, once in ram_block_add_cpr_blocker because aux-ram-share=off so
rb->fd < 0, and once in ram_block_add for a specific guest_memfd blocker.

To fix, add the guest_memfd blocker iff a generic one would not be
added by ram_block_add_cpr_blocker.

Fixes: 094a3dbc55df ("migration: ram block cpr blockers")
Reported-by: Tom Lendacky <thomas.lendacky@amd.com>
Reported-by: Michael Roth <michael.roth@amd.com>
Tested-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Message-ID: <1743087130-429075-1-git-send-email-steven.sistare@oracle.com>
[reword subject line]
Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
Steve Sistare 2025-03-27 07:52:10 -07:00 committed by Fabiano Rosas
parent b876e721f1
commit 694b5a913d
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
system/physmem.c
View File

@ -158,6 +158,7 @@ static void io_mem_init(void);
static void memory_map_init(void); static void memory_map_init(void);
static void tcg_log_global_after_sync(MemoryListener *listener); static void tcg_log_global_after_sync(MemoryListener *listener);
static void tcg_commit(MemoryListener *listener); static void tcg_commit(MemoryListener *listener);
static bool ram_is_cpr_compatible(RAMBlock *rb);
/** /**
* CPUAddressSpace: all the information a CPU needs about an AddressSpace * CPUAddressSpace: all the information a CPU needs about an AddressSpace
@ -1908,13 +1909,18 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
goto out_free; goto out_free;
} }
error_setg(&new_block->cpr_blocker, /*
"Memory region %s uses guest_memfd, " * Add a specific guest_memfd blocker if a generic one would not be
"which is not supported with CPR.", * added by ram_block_add_cpr_blocker.
memory_region_name(new_block->mr)); */
migrate_add_blocker_modes(&new_block->cpr_blocker, errp, if (ram_is_cpr_compatible(new_block)) {
MIG_MODE_CPR_TRANSFER, error_setg(&new_block->cpr_blocker,
-1); "Memory region %s uses guest_memfd, "
"which is not supported with CPR.",
memory_region_name(new_block->mr));
migrate_add_blocker_modes(&new_block->cpr_blocker, errp,
MIG_MODE_CPR_TRANSFER, -1);
}
} }
ram_size = (new_block->offset + new_block->max_length) >> TARGET_PAGE_BITS; ram_size = (new_block->offset + new_block->max_length) >> TARGET_PAGE_BITS;