Commit daebaabb authored Sep 07, 2015 by Bharata B Rao Committed by Michael Ellerman Sep 08, 2015

powerpc/pseries: Release DRC when configure_connector fails



Commit f32393c9 ("powerpc/pseries: Correct cpu affinity for
dlpar added cpus") moved dlpar_acquire_drc() call to before
dlpar_configure_connector() call in dlpar_cpu_probe(), but missed
to release the DRC if dlpar_configure_connector() failed.
During CPU hotplug, if configure-connector fails for any reason,
then this will result in subsequent CPU hotplug attempts to fail.

Release the acquired DRC if dlpar_configure_connector() call fails
so that the DRC is left in right isolation and allocation state
for the subsequent hotplug operation to succeed.

Fixes: f32393c9 ("powerpc/pseries: Correct cpu affinity for dlpar added cpus")
Cc: stable@vger.kernel.org # 4.1+
Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 7d1647dc

arch/powerpc/platforms/pseries/dlpar.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -422,8 +422,10 @@ static ssize_t dlpar_cpu_probe(const char *buf, size_t count)

		dn = dlpar_configure_connector(cpu_to_be32(drc_index), parent);
		of_node_put(parent);
		if (!dn)
		if (!dn) {
		dlpar_release_drc(drc_index);
		return -EINVAL;
		}

		rc = dlpar_attach_node(dn);
		if (rc) {