Commit b36eb5e7 authored by Corey Minyard's avatar Corey Minyard

ipmi: Disable some operations during a panic

Don't do kfree or other risky things when oops_in_progress is set.
It's easy enough to avoid doing them
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parent db05ddf7
...@@ -4789,6 +4789,8 @@ static atomic_t recv_msg_inuse_count = ATOMIC_INIT(0); ...@@ -4789,6 +4789,8 @@ static atomic_t recv_msg_inuse_count = ATOMIC_INIT(0);
static void free_smi_msg(struct ipmi_smi_msg *msg) static void free_smi_msg(struct ipmi_smi_msg *msg)
{ {
atomic_dec(&smi_msg_inuse_count); atomic_dec(&smi_msg_inuse_count);
/* Try to keep as much stuff out of the panic path as possible. */
if (!oops_in_progress)
kfree(msg); kfree(msg);
} }
...@@ -4808,6 +4810,8 @@ EXPORT_SYMBOL(ipmi_alloc_smi_msg); ...@@ -4808,6 +4810,8 @@ EXPORT_SYMBOL(ipmi_alloc_smi_msg);
static void free_recv_msg(struct ipmi_recv_msg *msg) static void free_recv_msg(struct ipmi_recv_msg *msg)
{ {
atomic_dec(&recv_msg_inuse_count); atomic_dec(&recv_msg_inuse_count);
/* Try to keep as much stuff out of the panic path as possible. */
if (!oops_in_progress)
kfree(msg); kfree(msg);
} }
...@@ -4826,7 +4830,7 @@ static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void) ...@@ -4826,7 +4830,7 @@ static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void)
void ipmi_free_recv_msg(struct ipmi_recv_msg *msg) void ipmi_free_recv_msg(struct ipmi_recv_msg *msg)
{ {
if (msg->user) if (msg->user && !oops_in_progress)
kref_put(&msg->user->refcount, free_user); kref_put(&msg->user->refcount, free_user);
msg->done(msg); msg->done(msg);
} }
......
...@@ -342,13 +342,17 @@ static atomic_t msg_tofree = ATOMIC_INIT(0); ...@@ -342,13 +342,17 @@ static atomic_t msg_tofree = ATOMIC_INIT(0);
static DECLARE_COMPLETION(msg_wait); static DECLARE_COMPLETION(msg_wait);
static void msg_free_smi(struct ipmi_smi_msg *msg) static void msg_free_smi(struct ipmi_smi_msg *msg)
{ {
if (atomic_dec_and_test(&msg_tofree)) if (atomic_dec_and_test(&msg_tofree)) {
if (!oops_in_progress)
complete(&msg_wait); complete(&msg_wait);
}
} }
static void msg_free_recv(struct ipmi_recv_msg *msg) static void msg_free_recv(struct ipmi_recv_msg *msg)
{ {
if (atomic_dec_and_test(&msg_tofree)) if (atomic_dec_and_test(&msg_tofree)) {
if (!oops_in_progress)
complete(&msg_wait); complete(&msg_wait);
}
} }
static struct ipmi_smi_msg smi_msg = { static struct ipmi_smi_msg smi_msg = {
.done = msg_free_smi .done = msg_free_smi
...@@ -434,8 +438,10 @@ static int _ipmi_set_timeout(int do_heartbeat) ...@@ -434,8 +438,10 @@ static int _ipmi_set_timeout(int do_heartbeat)
rv = __ipmi_set_timeout(&smi_msg, rv = __ipmi_set_timeout(&smi_msg,
&recv_msg, &recv_msg,
&send_heartbeat_now); &send_heartbeat_now);
if (rv) if (rv) {
atomic_set(&msg_tofree, 0);
return rv; return rv;
}
wait_for_completion(&msg_wait); wait_for_completion(&msg_wait);
...@@ -580,6 +586,7 @@ static int __ipmi_heartbeat(void) ...@@ -580,6 +586,7 @@ static int __ipmi_heartbeat(void)
&recv_msg, &recv_msg,
1); 1);
if (rv) { if (rv) {
atomic_set(&msg_tofree, 0);
pr_warn("heartbeat send failure: %d\n", rv); pr_warn("heartbeat send failure: %d\n", rv);
return rv; return rv;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment