@samitouri / QOSamiQemu / commits / 792cb90e84

memory: Set mr->ram before RAM Block allocation

Commit 2fb627ef2f48 ("memory: Factor out common ram region initialization") introduced a helper function memory_region_set_ram_block(), which causes mr->ram to be set to true after the RAM Block allocation by qemu_ram_alloc_*(). It leads to the assertion g_assert(memory_region_is_ram(mr)); in memory_region_set_ram_discard_manager() being triggered when creating RAM Block with the RAM_GUEST_MEMFD flag. Fix this by restoring the original behavior of setting mr->ram before RAM Block allocation. Closes: https://gitlab.com/qemu-project/qemu/-/work_items/3330 Reported-by: Farrah Chen <farrah.chen@intel.com> Link: https://lore.kernel.org/r/df63fdf0-05ea-4de0-8009-c52703e4b052@amd.com Reported-by: Kim Phillips <kim.phillips@amd.com> Fixes: 2fb627ef2f48 ("memory: Factor out common ram region initialization") Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> Tested-by: Kim Phillips <kim.phillips@amd.com> Link: https://lore.kernel.org/r/20260312063420.973637-1-xiaoyao.li@intel.com Signed-off-by: Peter Xu <peterx@redhat.com>

Xiaoyao Li committed Mar 12, 2026 at 14:34 UTC 792cb90e849f3bd134e2bfad26591945fa44e2b4

1 file changed +6 -2

system/memory.c

+6 -2

@@ -1578,7 +1578,6 @@ void memory_region_init_io(MemoryRegion *mr, Object *owner,

1578

1579 static bool memory_region_set_ram_block(MemoryRegion *mr, RAMBlock *rb)

1580 {

1581 - mr->ram = true;

1581 mr->terminates = true;

1582 mr->destructor = memory_region_destructor_ram;

1583 mr->ram_block = rb;

@@ -1597,6 +1596,7 @@ bool memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, Object *owner,

1596 RAMBlock *rb;

1597

1598 memory_region_init(mr, owner, name, size);

1599 + mr->ram = true;

1600 rb = qemu_ram_alloc(size, ram_flags, mr, errp);

1601 return memory_region_set_ram_block(mr, rb);

1602 }

@@ -1614,6 +1614,7 @@ bool memory_region_init_resizeable_ram(MemoryRegion *mr,

1614 RAMBlock *rb;

1615

1616 memory_region_init(mr, owner, name, size);

1617 + mr->ram = true;

1618 rb = qemu_ram_alloc_resizeable(size, max_size, resized, mr, errp);

1619 return memory_region_set_ram_block(mr, rb);

1620 }

@@ -1628,6 +1629,7 @@ bool memory_region_init_ram_from_file(MemoryRegion *mr, Object *owner,

1629 RAMBlock *rb;

1630

1631 memory_region_init(mr, owner, name, size);

1632 + mr->ram = true;

1633 mr->readonly = !!(ram_flags & RAM_READONLY);

1634 mr->align = align;

1635 rb = qemu_ram_alloc_from_file(size, mr, ram_flags, path, offset, errp);

@@ -1642,6 +1644,7 @@ bool memory_region_init_ram_from_fd(MemoryRegion *mr, Object *owner,

1644 RAMBlock *rb;

1645

1646 memory_region_init(mr, owner, name, size);

1647 + mr->ram = true;

1648 mr->readonly = !!(ram_flags & RAM_READONLY);

1649 rb = qemu_ram_alloc_from_fd(size, size, NULL, mr, ram_flags, fd, offset,

1650 false, errp);

@@ -1663,6 +1666,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, Object *owner,

1666 void *ptr)

1667 {

1668 memory_region_init(mr, owner, name, size);

1669 + mr->ram = true;

1670 memory_region_set_ram_ptr(mr, size, ptr);

1671 }

1672

@@ -1671,6 +1675,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr, Object *owner,

1675 void *ptr)

1676 {

1677 memory_region_init_io(mr, owner, &ram_device_mem_ops, mr, name, size);

1678 + mr->ram = true;

1679 mr->ram_device = true;

1680 memory_region_set_ram_ptr(mr, size, ptr);

1681 }

@@ -3699,7 +3704,6 @@ bool memory_region_init_rom_device(MemoryRegion *mr, Object *owner,

3704 memory_region_init_io(mr, owner, ops, opaque, name, size);

3705 rb = qemu_ram_alloc(size, 0, mr, errp);

3706 if (memory_region_set_ram_block(mr, rb)) {

3702 - mr->ram = false;

3707 mr->rom_device = true;

3708 memory_region_register_ram(mr, owner);

3709 return true;