From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
James.Bottomley@steeleye.com, miquels@cistron.nl,
aacraid@adaptec.com, mark_salyzyn@adaptec.com
Subject: [patch 06/19] [PATCH] dpt_i2o fix for deadlock condition
Date: Fri, 23 Dec 2005 14:47:58 -0800 [thread overview]
Message-ID: <20051223224758.GF19057@kroah.com> (raw)
In-Reply-To: <20051223224712.GA18975@kroah.com>
[-- Attachment #1: dpt_i2o-fix-for-deadlock-condition.patch --]
[-- Type: text/plain, Size: 3051 bytes --]
-stable review patch. If anyone has any objections, please let us know.
------------------
From: "Salyzyn, Mark" <mark_salyzyn@adaptec.com>
Miquel van Smoorenburg <miquels@cistron.nl> forwarded me this fix to
resolve a deadlock condition that occurs due to the API change in 2.6.13+
kernels dropping the host locking when entering the error handling. They
all end up calling adpt_i2o_post_wait(), which if you call it unlocked,
might return with host_lock locked anyway and that causes a deadlock.
Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/scsi/dpt_i2o.c | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
--- linux-2.6.14.4.orig/drivers/scsi/dpt_i2o.c
+++ linux-2.6.14.4/drivers/scsi/dpt_i2o.c
@@ -660,7 +660,12 @@ static int adpt_abort(struct scsi_cmnd *
msg[2] = 0;
msg[3]= 0;
msg[4] = (u32)cmd;
- if( (rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER)) != 0){
+ if (pHba->host)
+ spin_lock_irq(pHba->host->host_lock);
+ rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER);
+ if (pHba->host)
+ spin_unlock_irq(pHba->host->host_lock);
+ if (rcode != 0) {
if(rcode == -EOPNOTSUPP ){
printk(KERN_INFO"%s: Abort cmd not supported\n",pHba->name);
return FAILED;
@@ -697,10 +702,15 @@ static int adpt_device_reset(struct scsi
msg[2] = 0;
msg[3] = 0;
+ if (pHba->host)
+ spin_lock_irq(pHba->host->host_lock);
old_state = d->state;
d->state |= DPTI_DEV_RESET;
- if( (rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER)) ){
- d->state = old_state;
+ rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER);
+ d->state = old_state;
+ if (pHba->host)
+ spin_unlock_irq(pHba->host->host_lock);
+ if (rcode != 0) {
if(rcode == -EOPNOTSUPP ){
printk(KERN_INFO"%s: Device reset not supported\n",pHba->name);
return FAILED;
@@ -708,7 +718,6 @@ static int adpt_device_reset(struct scsi
printk(KERN_INFO"%s: Device reset failed\n",pHba->name);
return FAILED;
} else {
- d->state = old_state;
printk(KERN_INFO"%s: Device reset successful\n",pHba->name);
return SUCCESS;
}
@@ -721,6 +730,7 @@ static int adpt_bus_reset(struct scsi_cm
{
adpt_hba* pHba;
u32 msg[4];
+ u32 rcode;
pHba = (adpt_hba*)cmd->device->host->hostdata[0];
memset(msg, 0, sizeof(msg));
@@ -729,7 +739,12 @@ static int adpt_bus_reset(struct scsi_cm
msg[1] = (I2O_HBA_BUS_RESET<<24|HOST_TID<<12|pHba->channel[cmd->device->channel].tid);
msg[2] = 0;
msg[3] = 0;
- if(adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER) ){
+ if (pHba->host)
+ spin_lock_irq(pHba->host->host_lock);
+ rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER);
+ if (pHba->host)
+ spin_unlock_irq(pHba->host->host_lock);
+ if (rcode != 0) {
printk(KERN_WARNING"%s: Bus reset failed.\n",pHba->name);
return FAILED;
} else {
--
next prev parent reply other threads:[~2005-12-23 22:51 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20051223221200.342826000@press.kroah.org>
2005-12-23 22:47 ` [patch 00/19] -stable review for 2.6.14.5 Greg Kroah-Hartman
2005-12-23 22:47 ` [patch 01/19] ACPI: Add support for FADT P_LVL2_UP flag Greg Kroah-Hartman
2005-12-24 15:38 ` Pavel Machek
2005-12-24 16:14 ` Daniel Drake
2005-12-26 23:54 ` Greg KH
2005-12-23 22:47 ` [patch 02/19] ACPI: Prefer _CST over FADT for C-state capabilities Greg Kroah-Hartman
2005-12-23 22:47 ` [patch 03/19] [NETFILTER]: Fix CTA_PROTO_NUM attribute size in ctnetlink Greg Kroah-Hartman
2005-12-23 22:47 ` [patch 04/19] [NETFILTER]: Fix unbalanced read_unlock_bh " Greg Kroah-Hartman
2005-12-23 22:47 ` [patch 05/19] apci: fix NULL deref in video/lcd/brightness Greg Kroah-Hartman
2005-12-23 22:47 ` Greg Kroah-Hartman [this message]
2005-12-23 22:48 ` [patch 07/19] [GRE]: Fix hardware checksum modification Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 08/19] [VLAN]: Fix hardware rx csum errors Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 09/19] [NETFILTER]: Fix NAT init order Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 10/19] [NETFILTER]: Fix incorrect dependency for IP6_NF_TARGET_NFQUEUE Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 11/19] [RTNETLINK]: Fix RTNLGRP definitions in rtnetlink.h Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 12/19] [BRIDGE-NF]: Fix bridge-nf ipv6 length check Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 13/19] [IPV6]: Fix route lifetime Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 14/19] [IPSEC]: Perform SA switchover immediately Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 15/19] [PATCH] Input: fix an OOPS in HID driver Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 16/19] kernel/params.c: fix sysfs access with CONFIG_MODULES=n Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 17/19] SCSI: fix transfer direction in sd (kernel panic when ejecting iPod) Greg Kroah-Hartman
2005-12-23 22:48 ` [patch 18/19] SCSI: fix transfer direction in scsi_lib and st Greg Kroah-Hartman
2005-12-23 23:05 ` James Bottomley
2005-12-23 23:22 ` [stable] " Chris Wright
2005-12-23 22:48 ` [patch 19/19] setting ACLs on readonly mounted NFS filesystems (CVE-2005-3623) Greg Kroah-Hartman
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=20051223224758.GF19057@kroah.com \
--to=gregkh@suse.de \
--cc=James.Bottomley@steeleye.com \
--cc=aacraid@adaptec.com \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark_salyzyn@adaptec.com \
--cc=miquels@cistron.nl \
--cc=rdunlap@xenotime.net \
--cc=stable@kernel.org \
--cc=torvalds@osdl.org \
--cc=tytso@mit.edu \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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