Skip to content

Commit 094a3db

Browse files
Steve SistareFabiano Rosas
authored andcommitted
migration: ram block cpr blockers
Unlike cpr-reboot mode, cpr-transfer mode cannot save volatile ram blocks in the migration stream file and recreate them later, because the physical memory for the blocks is pinned and registered for vfio. Add a blocker for volatile ram blocks. Also add a blocker for RAM_GUEST_MEMFD. Preserving guest_memfd may be sufficient for CPR, but it has not been tested yet. Signed-off-by: Steve Sistare <[email protected]> Reviewed-by: Fabiano Rosas <[email protected]> Reviewed-by: Peter Xu <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Message-ID: <[email protected]> Signed-off-by: Fabiano Rosas <[email protected]>
1 parent d657a14 commit 094a3db

File tree

4 files changed

+72
-0
lines changed

4 files changed

+72
-0
lines changed

include/exec/memory.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3203,6 +3203,9 @@ bool ram_block_discard_is_disabled(void);
32033203
*/
32043204
bool ram_block_discard_is_required(void);
32053205

3206+
void ram_block_add_cpr_blocker(RAMBlock *rb, Error **errp);
3207+
void ram_block_del_cpr_blocker(RAMBlock *rb);
3208+
32063209
#endif
32073210

32083211
#endif

include/exec/ramblock.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ struct RAMBlock {
3939
/* RCU-enabled, writes protected by the ramlist lock */
4040
QLIST_ENTRY(RAMBlock) next;
4141
QLIST_HEAD(, RAMBlockNotifier) ramblock_notifiers;
42+
Error *cpr_blocker;
4243
int fd;
4344
uint64_t fd_offset;
4445
int guest_memfd;

migration/savevm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3514,12 +3514,14 @@ void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev)
35143514
qemu_ram_set_idstr(mr->ram_block,
35153515
memory_region_name(mr), dev);
35163516
qemu_ram_set_migratable(mr->ram_block);
3517+
ram_block_add_cpr_blocker(mr->ram_block, &error_fatal);
35173518
}
35183519

35193520
void vmstate_unregister_ram(MemoryRegion *mr, DeviceState *dev)
35203521
{
35213522
qemu_ram_unset_idstr(mr->ram_block);
35223523
qemu_ram_unset_migratable(mr->ram_block);
3524+
ram_block_del_cpr_blocker(mr->ram_block);
35233525
}
35243526

35253527
void vmstate_register_ram_global(MemoryRegion *mr)

system/physmem.c

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@
7171

7272
#include "qemu/pmem.h"
7373

74+
#include "qapi/qapi-types-migration.h"
75+
#include "migration/blocker.h"
7476
#include "migration/cpr.h"
77+
#include "migration/options.h"
7578
#include "migration/vmstate.h"
7679

7780
#include "qemu/range.h"
@@ -1904,6 +1907,14 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
19041907
qemu_mutex_unlock_ramlist();
19051908
goto out_free;
19061909
}
1910+
1911+
error_setg(&new_block->cpr_blocker,
1912+
"Memory region %s uses guest_memfd, "
1913+
"which is not supported with CPR.",
1914+
memory_region_name(new_block->mr));
1915+
migrate_add_blocker_modes(&new_block->cpr_blocker, errp,
1916+
MIG_MODE_CPR_TRANSFER,
1917+
-1);
19071918
}
19081919

19091920
ram_size = (new_block->offset + new_block->max_length) >> TARGET_PAGE_BITS;
@@ -4095,3 +4106,58 @@ bool ram_block_discard_is_required(void)
40954106
return qatomic_read(&ram_block_discard_required_cnt) ||
40964107
qatomic_read(&ram_block_coordinated_discard_required_cnt);
40974108
}
4109+
4110+
/*
4111+
* Return true if ram is compatible with CPR. Do not exclude rom,
4112+
* because the rom file could change in new QEMU.
4113+
*/
4114+
static bool ram_is_cpr_compatible(RAMBlock *rb)
4115+
{
4116+
MemoryRegion *mr = rb->mr;
4117+
4118+
if (!mr || !memory_region_is_ram(mr)) {
4119+
return true;
4120+
}
4121+
4122+
/* Ram device is remapped in new QEMU */
4123+
if (memory_region_is_ram_device(mr)) {
4124+
return true;
4125+
}
4126+
4127+
/*
4128+
* A file descriptor is passed to new QEMU and remapped, or its backing
4129+
* file is reopened and mapped. It must be shared to avoid COW.
4130+
*/
4131+
if (rb->fd >= 0 && qemu_ram_is_shared(rb)) {
4132+
return true;
4133+
}
4134+
4135+
return false;
4136+
}
4137+
4138+
/*
4139+
* Add a blocker for each volatile ram block. This function should only be
4140+
* called after we know that the block is migratable. Non-migratable blocks
4141+
* are either re-created in new QEMU, or are handled specially, or are covered
4142+
* by a device-level CPR blocker.
4143+
*/
4144+
void ram_block_add_cpr_blocker(RAMBlock *rb, Error **errp)
4145+
{
4146+
assert(qemu_ram_is_migratable(rb));
4147+
4148+
if (ram_is_cpr_compatible(rb)) {
4149+
return;
4150+
}
4151+
4152+
error_setg(&rb->cpr_blocker,
4153+
"Memory region %s is not compatible with CPR. share=on is "
4154+
"required for memory-backend objects, and aux-ram-share=on is "
4155+
"required.", memory_region_name(rb->mr));
4156+
migrate_add_blocker_modes(&rb->cpr_blocker, errp, MIG_MODE_CPR_TRANSFER,
4157+
-1);
4158+
}
4159+
4160+
void ram_block_del_cpr_blocker(RAMBlock *rb)
4161+
{
4162+
migrate_del_blocker(&rb->cpr_blocker);
4163+
}

0 commit comments

Comments
 (0)