| From a747c5abc329611220f16df0bb4cf0ca4a7fdf0c Mon Sep 17 00:00:00 2001 |
| From: Jiri Kosina <jkosina@suse.cz> |
| Date: Wed, 26 May 2010 14:43:53 -0700 |
| Subject: ipmi: handle run_to_completion properly in deliver_recv_msg() |
| |
| From: Jiri Kosina <jkosina@suse.cz> |
| |
| commit a747c5abc329611220f16df0bb4cf0ca4a7fdf0c upstream. |
| |
| If run_to_completion flag is set, it means that we are running in a |
| single-threaded mode, and thus no locks are held. |
| |
| This fixes a deadlock when IPMI notifier is being called during panic. |
| |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Acked-by: Corey Minyard <minyard@acm.org> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/char/ipmi/ipmi_si_intf.c | 11 ++++++++--- |
| 1 file changed, 8 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/char/ipmi/ipmi_si_intf.c |
| +++ b/drivers/char/ipmi/ipmi_si_intf.c |
| @@ -310,9 +310,14 @@ static void deliver_recv_msg(struct smi_ |
| { |
| /* Deliver the message to the upper layer with the lock |
| released. */ |
| - spin_unlock(&(smi_info->si_lock)); |
| - ipmi_smi_msg_received(smi_info->intf, msg); |
| - spin_lock(&(smi_info->si_lock)); |
| + |
| + if (smi_info->run_to_completion) { |
| + ipmi_smi_msg_received(smi_info->intf, msg); |
| + } else { |
| + spin_unlock(&(smi_info->si_lock)); |
| + ipmi_smi_msg_received(smi_info->intf, msg); |
| + spin_lock(&(smi_info->si_lock)); |
| + } |
| } |
| |
| static void return_hosed_msg(struct smi_info *smi_info, int cCode) |
