powerpc/pseries: Set UNISOLATE on dlpar_cpu_remove() failure

The RTAS set-indicator call, when attempting to UNISOLATE a DRC that is
already UNISOLATED or CONFIGURED, returns RTAS_OK and does nothing else
for both QEMU and phyp. This gives us an opportunity to use this
behavior to signal the hypervisor layer when an error during device
removal happens, allowing it to do a proper error handling, while not
breaking QEMU/phyp implementations that don't have this support.

This patch introduces this idea by unisolating all CPU DRCs that failed
to be removed by dlpar_cpu_remove_by_index(), when handling the
PSERIES_HP_ELOG_ID_DRC_INDEX event. This is being done for this event
only because its the only CPU removal event QEMU uses, and there's no
need at this moment to add this mechanism for phyp only code.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210416210216.380291-3-danielhb413@gmail.com

diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index ec478f8a98ff266b89140acfc8e883ca0bcaffa7..c230ab550aa960716f0008092a2bfa46d0734625 100644 (file)
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -816,8 +816,16 @@ int dlpar_cpu(struct pseries_hp_errorlog *hp_elog)
        case PSERIES_HP_ELOG_ACTION_REMOVE:
                if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT)
                        rc = dlpar_cpu_remove_by_count(count);
-               else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX)
+               else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {
                        rc = dlpar_cpu_remove_by_index(drc_index);
+                       /*
+                        * Setting the isolation state of an UNISOLATED/CONFIGURED
+                        * device to UNISOLATE is a no-op, but the hypervisor can
+                        * use it as a hint that the CPU removal failed.
+                        */
+                       if (rc)
+                               dlpar_unisolate_drc(drc_index);
+               }
                else
                        rc = -EINVAL;
                break;