Message ID | 20230601121447.272487-1-david@redhat.com |
---|---|
State | Changes Requested |
Headers | show |
Series | memory-device: Track used region size in DeviceMemoryState | expand |
Working on adding multi-memslot support for virtio-mem (teaching memory device code about memory devices that can consume multiple memslots), I have some preparatory cleanups in my queue that make sense independent of the actual memory-device/virtio-mem extensions. v2 -> v3: - "memory-device: Introduce machine_memory_devices_init()" -- Declare the function in hw/boards.h - "hw/loongarch/virt: Use machine_memory_devices_init()" -- Use VIRT_HIGHMEM_BASE -- No need to include memory-device.h - "hw/i386/pc: Remove PC_MACHINE_DEVMEM_REGION_SIZ" -- Add more details why it's ok to the patch description - Adjust to memory_devices_init() -> machine_memory_devices_init() - Add RBs v1 -> v2: - Allocate ms->device_memory only if the size > 0. - Split it up and include more cleanups David Hildenbrand (10): memory-device: Unify enabled vs. supported error messages memory-device: Introduce machine_memory_devices_init() hw/arm/virt: Use machine_memory_devices_init() hw/ppc/spapr: Use machine_memory_devices_init() hw/loongarch/virt: Use machine_memory_devices_init() hw/i386/pc: Use machine_memory_devices_init() hw/i386/acpi-build: Rely on machine->device_memory when building SRAT hw/i386/pc: Remove PC_MACHINE_DEVMEM_REGION_SIZE memory-device: Refactor memory_device_pre_plug() memory-device: Track used region size in DeviceMemoryState hw/arm/virt.c | 9 +----- hw/i386/acpi-build.c | 9 ++---- hw/i386/pc.c | 36 +++------------------- hw/loongarch/virt.c | 12 ++------ hw/mem/memory-device.c | 69 +++++++++++++++++++----------------------- hw/ppc/spapr.c | 37 +++++++++++----------- hw/ppc/spapr_hcall.c | 2 +- include/hw/boards.h | 4 +++ include/hw/i386/pc.h | 1 - 9 files changed, 67 insertions(+), 112 deletions(-)
On 01.06.23 14:14, David Hildenbrand wrote: > Let's avoid iterating over all devices and simply track it in the > DeviceMemoryState. > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: David Hildenbrand <david@redhat.com> Not my week for sending patches, ignore this one, it's a duplicate with #10 ...
On 01.06.23 14:14, David Hildenbrand wrote: > Working on adding multi-memslot support for virtio-mem (teaching memory > device code about memory devices that can consume multiple memslots), I > have some preparatory cleanups in my queue that make sense independent of > the actual memory-device/virtio-mem extensions. > > v2 -> v3: > - "memory-device: Introduce machine_memory_devices_init()" > -- Declare the function in hw/boards.h > - "hw/loongarch/virt: Use machine_memory_devices_init()" > -- Use VIRT_HIGHMEM_BASE > -- No need to include memory-device.h > - "hw/i386/pc: Remove PC_MACHINE_DEVMEM_REGION_SIZ" > -- Add more details why it's ok to the patch description > - Adjust to memory_devices_init() -> machine_memory_devices_init() > - Add RBs > > v1 -> v2: > - Allocate ms->device_memory only if the size > 0. > - Split it up and include more cleanups > > David Hildenbrand (10): > memory-device: Unify enabled vs. supported error messages > memory-device: Introduce machine_memory_devices_init() > hw/arm/virt: Use machine_memory_devices_init() > hw/ppc/spapr: Use machine_memory_devices_init() > hw/loongarch/virt: Use machine_memory_devices_init() > hw/i386/pc: Use machine_memory_devices_init() > hw/i386/acpi-build: Rely on machine->device_memory when building SRAT > hw/i386/pc: Remove PC_MACHINE_DEVMEM_REGION_SIZE > memory-device: Refactor memory_device_pre_plug() > memory-device: Track used region size in DeviceMemoryState > > hw/arm/virt.c | 9 +----- > hw/i386/acpi-build.c | 9 ++---- > hw/i386/pc.c | 36 +++------------------- > hw/loongarch/virt.c | 12 ++------ > hw/mem/memory-device.c | 69 +++++++++++++++++++----------------------- > hw/ppc/spapr.c | 37 +++++++++++----------- > hw/ppc/spapr_hcall.c | 2 +- > include/hw/boards.h | 4 +++ > include/hw/i386/pc.h | 1 - > 9 files changed, 67 insertions(+), 112 deletions(-) > Any further comments? If not, I'm planning on taking this through my memory-device tree.
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 00c7755557..667d56bd29 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -52,28 +52,11 @@ static int memory_device_build_list(Object *obj, void *opaque) return 0; } -static int memory_device_used_region_size(Object *obj, void *opaque) -{ - uint64_t *size = opaque; - - if (object_dynamic_cast(obj, TYPE_MEMORY_DEVICE)) { - const DeviceState *dev = DEVICE(obj); - const MemoryDeviceState *md = MEMORY_DEVICE(obj); - - if (dev->realized) { - *size += memory_device_get_region_size(md, &error_abort); - } - } - - object_child_foreach(obj, memory_device_used_region_size, opaque); - return 0; -} - static void memory_device_check_addable(MachineState *ms, MemoryRegion *mr, Error **errp) { + const uint64_t used_region_size = ms->device_memory->used_region_size; const uint64_t size = memory_region_size(mr); - uint64_t used_region_size = 0; /* we will need a new memory slot for kvm and vhost */ if (kvm_enabled() && !kvm_has_free_slot(ms)) { @@ -86,7 +69,6 @@ static void memory_device_check_addable(MachineState *ms, MemoryRegion *mr, } /* will we exceed the total amount of memory specified */ - memory_device_used_region_size(OBJECT(ms), &used_region_size); if (used_region_size + size < used_region_size || used_region_size + size > ms->maxram_size - ms->ram_size) { error_setg(errp, "not enough space, currently 0x%" PRIx64 @@ -292,6 +274,7 @@ void memory_device_plug(MemoryDeviceState *md, MachineState *ms) mr = mdc->get_memory_region(md, &error_abort); g_assert(ms->device_memory); + ms->device_memory->used_region_size += memory_region_size(mr); memory_region_add_subregion(&ms->device_memory->mr, addr - ms->device_memory->base, mr); trace_memory_device_plug(DEVICE(md)->id ? DEVICE(md)->id : "", addr); @@ -310,6 +293,7 @@ void memory_device_unplug(MemoryDeviceState *md, MachineState *ms) g_assert(ms->device_memory); memory_region_del_subregion(&ms->device_memory->mr, mr); + ms->device_memory->used_region_size -= memory_region_size(mr); trace_memory_device_unplug(DEVICE(md)->id ? DEVICE(md)->id : "", mdc->get_addr(md)); } diff --git a/include/hw/boards.h b/include/hw/boards.h index be06e8a41f..fcaf40b9da 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -296,11 +296,13 @@ struct MachineClass { * address space for memory devices starts * @mr: address space container for memory devices * @dimm_size: the sum of plugged DIMMs' sizes + * @used_region_size: the part of @mr already used by memory devices */ typedef struct DeviceMemoryState { hwaddr base; MemoryRegion mr; uint64_t dimm_size; + uint64_t used_region_size; } DeviceMemoryState; /**