From 46492a0e634cc9d56c1dbb4502c54480e1fd8f7d Mon Sep 17 00:00:00 2001
From: Michael Bringmann <mwb@linux.vnet.ibm.com>
Date: Sun, 29 Jul 2018 08:19:33 -0500
Subject: [PATCH 5/5] hotplug/pmt: Update topology after PMT
References: FATE#325308
Patch-mainline: submitted https://patchwork.ozlabs.org/cover/950609/
hotplug/pmt: Invoke rebuild_sched_domains before applying any CPU
'readd' modifications. The call leads to arch_update_cpu_topology()
which will recognize and report any changes to the CPU topology
are now applied, and that the relevant system data structures are
updated. It may also initialize nodes that were unused in the
topology of the source migration system. This will avoid some
locking synchronization issues that were observed during development
of this patch set. Also, the addition of the explicit call ensures
that such changes are made even when the automatic topology update
worker, triggered by a timer, has been disabled.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Acked-by: Michal Suchanek <msuchanek@suse.de>
---
arch/powerpc/platforms/pseries/dlpar.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 9343dbcd2607..a361cfde73d4 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -16,6 +16,7 @@
#include <linux/notifier.h>
#include <linux/spinlock.h>
#include <linux/cpu.h>
+#include <linux/cpuset.h>
#include <linux/slab.h>
#include <linux/of.h>
@@ -453,6 +454,17 @@ static int dlpar_pmt(struct pseries_hp_errorlog *work)
{
struct list_head *pos, *q;
+ /* Rebuild the domains and init any memoryless nodes
+ * first to avoid later sync issues with CPU readd.
+ */
+ rebuild_sched_domains();
+ msleep(100);
+ /* Ensure that the worker for rebuild_sched_domains
+ * has the opportunity to actually begin work as we
+ * don't want it delayed by the CPU readd hotplug
+ * locking.
+ */
+
list_for_each_safe(pos, q, &dlpar_delayed_list) {
struct pseries_hp_errorlog *tmp;
--
2.13.7