|
 |
383d26 |
From 55cc729e37b945bcbb9135fe5553d1bb9a293424 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: Serhii Popovych <spopovyc@redhat.com>
|
|
|
383d26 |
Date: Wed, 2 May 2018 18:52:28 +0200
|
|
|
383d26 |
Subject: [PATCH 05/13] Revert "spapr: Don't allow memory hotplug to memory
|
|
|
383d26 |
less nodes"
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: Serhii Popovych <spopovyc@redhat.com>
|
|
|
383d26 |
Message-id: <1525287148-92715-3-git-send-email-spopovyc@redhat.com>
|
|
|
383d26 |
Patchwork-id: 80012
|
|
|
383d26 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 2/2] Revert "spapr: Don't allow memory hotplug to memory less nodes"
|
|
|
383d26 |
Bugzilla: 1570525
|
|
|
383d26 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
This reverts commit b556854bd8524c26b8be98ab1bfdf0826831e793.
|
|
|
383d26 |
|
|
|
383d26 |
Leave change @node type from uint32_t to to int from reverted commit
|
|
|
383d26 |
because node < 0 is always false.
|
|
|
383d26 |
|
|
|
383d26 |
Note that implementing capability or some trick to detect if guest
|
|
|
383d26 |
kernel does not support hot-add to memory: this returns previous
|
|
|
383d26 |
behavour where memory added to first non-empty node.
|
|
|
383d26 |
|
|
|
383d26 |
Signed-off-by: Serhii Popovych <spopovyc@redhat.com>
|
|
|
383d26 |
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
|
|
383d26 |
(cherry picked from commit e47f1d2786c3d01a7894a493aafe0efa6b64453c)
|
|
|
383d26 |
Signed-off-by: Serhii Popovych <spopovyc@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
hw/ppc/spapr.c | 22 ----------------------
|
|
|
383d26 |
1 file changed, 22 deletions(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
383d26 |
index c9561e1..6f005a0 100644
|
|
|
383d26 |
--- a/hw/ppc/spapr.c
|
|
|
383d26 |
+++ b/hw/ppc/spapr.c
|
|
|
383d26 |
@@ -3501,28 +3501,6 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev,
|
|
|
383d26 |
return;
|
|
|
383d26 |
}
|
|
|
383d26 |
|
|
|
383d26 |
- /*
|
|
|
383d26 |
- * Currently PowerPC kernel doesn't allow hot-adding memory to
|
|
|
383d26 |
- * memory-less node, but instead will silently add the memory
|
|
|
383d26 |
- * to the first node that has some memory. This causes two
|
|
|
383d26 |
- * unexpected behaviours for the user.
|
|
|
383d26 |
- *
|
|
|
383d26 |
- * - Memory gets hotplugged to a different node than what the user
|
|
|
383d26 |
- * specified.
|
|
|
383d26 |
- * - Since pc-dimm subsystem in QEMU still thinks that memory belongs
|
|
|
383d26 |
- * to memory-less node, a reboot will set things accordingly
|
|
|
383d26 |
- * and the previously hotplugged memory now ends in the right node.
|
|
|
383d26 |
- * This appears as if some memory moved from one node to another.
|
|
|
383d26 |
- *
|
|
|
383d26 |
- * So until kernel starts supporting memory hotplug to memory-less
|
|
|
383d26 |
- * nodes, just prevent such attempts upfront in QEMU.
|
|
|
383d26 |
- */
|
|
|
383d26 |
- if (nb_numa_nodes && !numa_info[node].node_mem) {
|
|
|
383d26 |
- error_setg(errp, "Can't hotplug memory to memory-less node %d",
|
|
|
383d26 |
- node);
|
|
|
383d26 |
- return;
|
|
|
383d26 |
- }
|
|
|
383d26 |
-
|
|
|
383d26 |
spapr_memory_plug(hotplug_dev, dev, node, errp);
|
|
|
383d26 |
} else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {
|
|
|
383d26 |
spapr_core_plug(hotplug_dev, dev, errp);
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|