[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] pc: acpi: fix memory hotplug regression by reduc
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 4/5] pc: acpi: fix memory hotplug regression by reducing stub SRAT entry size |
Date: |
Fri, 3 Aug 2018 12:28:04 +0300 |
From: Igor Mammedov <address@hidden>
Commit 848a1cc1e (hw/acpi-build: build SRAT memory affinity structures for DIMM
devices)
broke the first dimm hotplug in following cases:
1: there is no coldplugged dimm in the last numa node
but there is a coldplugged dimm in another node
-m 4096,slots=4,maxmem=32G \
-object memory-backend-ram,id=m0,size=2G \
-device pc-dimm,memdev=m0,node=0 \
-numa node,nodeid=0 \
-numa node,nodeid=1
2: if order of dimms on CLI is:
1st plugged dimm in node1
2nd plugged dimm in node0
-m 4096,slots=4,maxmem=32G \
-object memory-backend-ram,size=2G,id=m0 \
-device pc-dimm,memdev=m0,node=1 \
-object memory-backend-ram,id=m1,size=2G \
-device pc-dimm,memdev=m1,node=0 \
-numa node,nodeid=0 \
-numa node,nodeid=1
(qemu) object_add memory-backend-ram,id=m2,size=1G
(qemu) device_add pc-dimm,memdev=m2,node=0
the first DIMM hotplug to any node except the last one
fails (Windows is unable to online it).
Length reduction of stub hotplug memory SRAT entry,
fixes issue for some reason.
RHBZ: 1609234
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/acpi-build.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index c584642e4e..e1ee8ae9e0 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2269,7 +2269,16 @@ static void build_srat_hotpluggable_memory(GArray
*table_data, uint64_t base,
numamem = acpi_data_push(table_data, sizeof *numamem);
if (!info) {
- build_srat_memory(numamem, cur, end - cur, default_node,
+ /*
+ * Entry is required for Windows to enable memory hotplug in OS
+ * and for Linux to enable SWIOTLB when booted with less than
+ * 4G of RAM. Windows works better if the entry sets proximity
+ * to the highest NUMA node in the machine at the end of the
+ * reserved space.
+ * Memory devices may override proximity set by this entry,
+ * providing _PXM method if necessary.
+ */
+ build_srat_memory(numamem, end - 1, 1, default_node,
MEM_AFFINITY_HOTPLUGGABLE |
MEM_AFFINITY_ENABLED);
break;
}
@@ -2405,14 +2414,6 @@ build_srat(GArray *table_data, BIOSLinker *linker,
MachineState *machine)
build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
}
- /*
- * Entry is required for Windows to enable memory hotplug in OS
- * and for Linux to enable SWIOTLB when booted with less than
- * 4G of RAM. Windows works better if the entry sets proximity
- * to the highest NUMA node in the machine.
- * Memory devices may override proximity set by this entry,
- * providing _PXM method if necessary.
- */
if (hotplugabble_address_space_size) {
build_srat_hotpluggable_memory(table_data,
machine->device_memory->base,
hotplugabble_address_space_size,
--
MST
- [Qemu-devel] [PULL 0/5] pc, virtio: fixes, Michael S. Tsirkin, 2018/08/03
- [Qemu-devel] [PULL 1/5] vhost: check region type before casting, Michael S. Tsirkin, 2018/08/03
- [Qemu-devel] [PULL 2/5] hw/acpi-build: Add a check for memory-less NUMA nodes, Michael S. Tsirkin, 2018/08/03
- [Qemu-devel] [PULL 3/5] tests/acpi-test: update ACPI tables test blobs, Michael S. Tsirkin, 2018/08/03
- [Qemu-devel] [PULL 4/5] pc: acpi: fix memory hotplug regression by reducing stub SRAT entry size,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 5/5] tests/acpi: update tables after memory hotplug changes, Michael S. Tsirkin, 2018/08/03
- Re: [Qemu-devel] [PULL 0/5] pc, virtio: fixes, Peter Maydell, 2018/08/03
- Re: [Qemu-devel] [PULL 0/5] pc, virtio: fixes, Peter Maydell, 2018/08/06