powerpc/pseries/mobility: prevent cpu hotplug during DT update

CPU online/offline code paths are sensitive to parts of the device
tree (various cpu node properties, cache nodes) that can be changed as
a result of a migration.

Prevent CPU hotplug while the device tree potentially is inconsistent.

Fixes: 410bccf978 ("powerpc/pseries: Partition migration in the kernel")
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Reviewed-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Nathan Lynch 2019-06-11 23:45:05 -05:00 committed by Michael Ellerman
parent d4aa219a07
commit e59a175faa
1 changed files with 9 additions and 0 deletions

View File

@ -9,6 +9,7 @@
* 2 as published by the Free Software Foundation. * 2 as published by the Free Software Foundation.
*/ */
#include <linux/cpu.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/kobject.h> #include <linux/kobject.h>
#include <linux/smp.h> #include <linux/smp.h>
@ -338,11 +339,19 @@ void post_mobility_fixup(void)
if (rc) if (rc)
printk(KERN_ERR "Post-mobility activate-fw failed: %d\n", rc); printk(KERN_ERR "Post-mobility activate-fw failed: %d\n", rc);
/*
* We don't want CPUs to go online/offline while the device
* tree is being updated.
*/
cpus_read_lock();
rc = pseries_devicetree_update(MIGRATION_SCOPE); rc = pseries_devicetree_update(MIGRATION_SCOPE);
if (rc) if (rc)
printk(KERN_ERR "Post-mobility device tree update " printk(KERN_ERR "Post-mobility device tree update "
"failed: %d\n", rc); "failed: %d\n", rc);
cpus_read_unlock();
/* Possibly switch to a new RFI flush type */ /* Possibly switch to a new RFI flush type */
pseries_setup_rfi_flush(); pseries_setup_rfi_flush();