From: Nathan Fontenot <nfont@linux•vnet.ibm.com>
To: linuxppc-dev@lists•ozlabs.org
Subject: [PATCH 3/6] pseries: Update CPU hotplug error recovery
Date: Mon, 22 Jun 2015 15:59:20 -0500 [thread overview]
Message-ID: <55887728.4030709@linux.vnet.ibm.com> (raw)
In-Reply-To: <558875FF.2040000@linux.vnet.ibm.com>
Update the cpu dlpar add/remove paths to do better error recovery when
a failure occurs during the add/remove operation. This includes adding
some pr_info and pr_debug statements.
Signed-off-by: Nathan Fontenot <nfont@linux•vnet.ibm.com>
---
arch/powerpc/platforms/pseries/hotplug-cpu.c | 34 +++++++++++++++++++++++---
1 file changed, 30 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index f58d902..7890b2f 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -18,6 +18,8 @@
* 2 of the License, or (at your option) any later version.
*/
+#define pr_fmt(fmt) "pseries-hotplug-cpu: " fmt
+
#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
@@ -386,22 +388,35 @@ static ssize_t dlpar_cpu_add(struct device_node *parent, u32 drc_index)
struct device_node *dn;
int rc;
+ pr_info("Attempting to add CPU, drc index %x\n", drc_index);
+
rc = dlpar_acquire_drc(drc_index);
if (rc)
return -EINVAL;
dn = dlpar_configure_connector(cpu_to_be32(drc_index), parent);
- if (!dn)
+ if (!dn) {
+ pr_debug("Failed call to configure-connector\n");
+ dlpar_release_drc(drc_index);
return -EINVAL;
+ }
rc = dlpar_attach_node(dn);
if (rc) {
+ pr_debug("Failed to attach node (%d)\n", rc);
dlpar_release_drc(drc_index);
dlpar_free_cc_nodes(dn);
return rc;
}
rc = dlpar_online_cpu(dn);
+ if (rc) {
+ pr_debug("Failed to online cpu (%d)\n", rc);
+ dlpar_detach_node(dn);
+ dlpar_release_drc(drc_index);
+ }
+
+ pr_info("Successfully added CPU, drc index %x\n", drc_index);
return rc;
}
@@ -465,18 +480,29 @@ static ssize_t dlpar_cpu_remove(struct device_node *dn, u32 drc_index)
{
int rc;
+ pr_info("Attemping to remove CPU, drc index %x\n", drc_index);
+
rc = dlpar_offline_cpu(dn);
- if (rc)
+ if (rc) {
+ pr_debug("Failed top offline cpu (%d)\n", rc);
return -EINVAL;
+ }
rc = dlpar_release_drc(drc_index);
- if (rc)
+ if (rc) {
+ pr_debug("Failed to release drc (%d)\n", rc);
+ dlpar_online_cpu(dn);
return rc;
+ }
rc = dlpar_detach_node(dn);
- if (rc)
+ if (rc) {
+ pr_debug("Failed to detach cpu node (%d)\n", rc);
dlpar_acquire_drc(drc_index);
+ dlpar_online_cpu(dn);
+ }
+ pr_info("Successfully removed CPU, drc index %x\n", drc_index);
return rc;
}
next prev parent reply other threads:[~2015-06-22 20:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-22 20:54 [PATCH 0/6] pseries: Move CPU dlpar into the kernel Nathan Fontenot
2015-06-22 20:56 ` [PATCH 1/6] pseries: Consolidate CPU hotplug code to hotplug-cpu.c Nathan Fontenot
2015-06-22 20:58 ` [PATCH 2/6] pseries: Factor out common cpu hotplug code Nathan Fontenot
2015-06-22 20:59 ` Nathan Fontenot [this message]
2015-07-21 4:46 ` [3/6] pseries: Update CPU hotplug error recovery Michael Ellerman
2015-07-21 19:14 ` Nathan Fontenot
2015-07-22 1:14 ` Michael Ellerman
2015-06-22 21:00 ` [PATCH 4/6] pseries: Add CPU dlpar remove functionality Nathan Fontenot
2015-07-21 9:27 ` [4/6] " Michael Ellerman
2015-07-21 21:34 ` Nathan Fontenot
2015-07-22 1:11 ` Michael Ellerman
2015-07-22 15:42 ` Nathan Fontenot
2015-07-21 9:46 ` Michael Ellerman
2015-06-22 21:01 ` [PATCH 5/6] pseries: Add CPU dlpar add functionality Nathan Fontenot
2015-06-22 21:02 ` [PATCH 6/6] pseries: Enable kernel CPU dlpar from sysfs Nathan Fontenot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55887728.4030709@linux.vnet.ibm.com \
--to=nfont@linux$(echo .)vnet.ibm.com \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox