aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/bnx2i/bnx2i_init.c
diff options
context:
space:
mode:
authorEddie Wai <eddie.wai@broadcom.com>2010-07-01 18:34:52 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-07-27 13:03:58 -0400
commit55e15c975cbf9ef8b765eba9ebadc96f2a2e5752 (patch)
tree9d0249480f287463f6ef98f03d58406c9965ac18 /drivers/scsi/bnx2i/bnx2i_init.c
parent46012e8b8de325472790d154f4cfb1cf2d4fc49a (diff)
[SCSI] bnx2i: Optimized the bnx2i_stop connection clean up procedure
For cases where the iSCSI disconnection procedure times out due to the iSCSI daemon being slow or unresponsive, the bnx2i_stop routine will now perform hardware cleanup via bnx2i_hw_ep_disconnect on all active endpoints so that subsequent operations will perform properly. Also moved the mutex locks inside ep_connect and ep_disconnect so that proper exclusivity can resolve simultaneous calls to the ep_disconnect routine. v2: Removed the unnecessary read lock in the bnx2i_stop Signed-off-by: Eddie Wai <eddie.wai@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Acked-by: Anil Veerabhadrappa <anilgv@broadcom.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/bnx2i/bnx2i_init.c')
-rw-r--r--drivers/scsi/bnx2i/bnx2i_init.c33
1 files changed, 30 insertions, 3 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_init.c
index af6a00a600fb..f0f8361af4e9 100644
--- a/drivers/scsi/bnx2i/bnx2i_init.c
+++ b/drivers/scsi/bnx2i/bnx2i_init.c
@@ -176,6 +176,9 @@ void bnx2i_start(void *handle)
176void bnx2i_stop(void *handle) 176void bnx2i_stop(void *handle)
177{ 177{
178 struct bnx2i_hba *hba = handle; 178 struct bnx2i_hba *hba = handle;
179 struct list_head *pos, *tmp;
180 struct bnx2i_endpoint *bnx2i_ep;
181 int conns_active;
179 182
180 /* check if cleanup happened in GOING_DOWN context */ 183 /* check if cleanup happened in GOING_DOWN context */
181 if (!test_and_clear_bit(ADAPTER_STATE_GOING_DOWN, 184 if (!test_and_clear_bit(ADAPTER_STATE_GOING_DOWN,
@@ -187,9 +190,33 @@ void bnx2i_stop(void *handle)
187 * control returns to network driver. So it is required to cleanup and 190 * control returns to network driver. So it is required to cleanup and
188 * release all connection resources before returning from this routine. 191 * release all connection resources before returning from this routine.
189 */ 192 */
190 wait_event_interruptible_timeout(hba->eh_wait, 193 while (hba->ofld_conns_active) {
191 (hba->ofld_conns_active == 0), 194 conns_active = hba->ofld_conns_active;
192 hba->hba_shutdown_tmo); 195 wait_event_interruptible_timeout(hba->eh_wait,
196 (hba->ofld_conns_active != conns_active),
197 hba->hba_shutdown_tmo);
198 if (hba->ofld_conns_active == conns_active)
199 break;
200 }
201 if (hba->ofld_conns_active) {
202 /* Stage to force the disconnection
203 * This is the case where the daemon is either slow or
204 * not present
205 */
206 printk(KERN_ALERT "bnx2i: Wait timeout, force all eps "
207 "to disconnect (%d)\n", hba->ofld_conns_active);
208 mutex_lock(&hba->net_dev_lock);
209 list_for_each_safe(pos, tmp, &hba->ep_active_list) {
210 bnx2i_ep = list_entry(pos, struct bnx2i_endpoint, link);
211 /* Clean up the chip only */
212 bnx2i_hw_ep_disconnect(bnx2i_ep);
213 }
214 mutex_unlock(&hba->net_dev_lock);
215 if (hba->ofld_conns_active)
216 printk(KERN_ERR "bnx2i: EP disconnect timeout (%d)!\n",
217 hba->ofld_conns_active);
218 }
219
193 /* This flag should be cleared last so that ep_disconnect() gracefully 220 /* This flag should be cleared last so that ep_disconnect() gracefully
194 * cleans up connection context 221 * cleans up connection context
195 */ 222 */