Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 23:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SCSI] bnx2i: Added chip cleanup for the remove module path

Browse Source 
In the case when an ep_connect request is interrupted due to route
request stall, if the iSCSI daemon is terminated by the user, the chip
will be left in a state which will not get cleaned up upon module
removal.  Upon module reload, when the same context id is used for a
new connection, chip panic would occur.

This patch adds chip cleanup in the module removal path.

Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
Acked-by: Benjamin Li <benli@broadcom.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Eddie Wai 2010-08-12 16:44:30 -07:00 committed by James Bottomley
parent 2c2255e08d
commit 250ae982e2
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/scsi/bnx2i/bnx2i_init.c
View File

@ -166,6 +166,38 @@ void bnx2i_start(void *handle)
} }
/**
* bnx2i_chip_cleanup - local routine to handle chip cleanup
* @hba: Adapter instance to register
*
* Driver checks if adapter still has any active connections before
* executing the cleanup process
*/
static void bnx2i_chip_cleanup(struct bnx2i_hba *hba)
{
struct bnx2i_endpoint *bnx2i_ep;
struct list_head *pos, *tmp;
if (hba->ofld_conns_active) {
/* Stage to force the disconnection
* This is the case where the daemon is either slow or
* not present
*/
printk(KERN_ALERT "bnx2i: (%s) chip cleanup for %d active "
"connections\n", hba->netdev->name,
hba->ofld_conns_active);
mutex_lock(&hba->net_dev_lock);
list_for_each_safe(pos, tmp, &hba->ep_active_list) {
bnx2i_ep = list_entry(pos, struct bnx2i_endpoint, link);
/* Clean up the chip only */
bnx2i_hw_ep_disconnect(bnx2i_ep);
bnx2i_ep->cm_sk = NULL;
}
mutex_unlock(&hba->net_dev_lock);
}
}
/** /**
* bnx2i_stop - cnic callback to shutdown adapter instance * bnx2i_stop - cnic callback to shutdown adapter instance
* @handle: transparent handle pointing to adapter structure * @handle: transparent handle pointing to adapter structure
@ -176,8 +208,6 @@ void bnx2i_start(void *handle)
void bnx2i_stop(void *handle) void bnx2i_stop(void *handle)
{ {
struct bnx2i_hba *hba = handle; struct bnx2i_hba *hba = handle;
struct list_head *pos, *tmp;
struct bnx2i_endpoint *bnx2i_ep;
int conns_active; int conns_active;
/* check if cleanup happened in GOING_DOWN context */ /* check if cleanup happened in GOING_DOWN context */
@ -198,24 +228,7 @@ void bnx2i_stop(void *handle)
if (hba->ofld_conns_active == conns_active) if (hba->ofld_conns_active == conns_active)
break; break;
} }
if (hba->ofld_conns_active) { bnx2i_chip_cleanup(hba);
/* Stage to force the disconnection
* This is the case where the daemon is either slow or
* not present
*/
printk(KERN_ALERT "bnx2i: Wait timeout, force all eps "
"to disconnect (%d)\n", hba->ofld_conns_active);
mutex_lock(&hba->net_dev_lock);
list_for_each_safe(pos, tmp, &hba->ep_active_list) {
bnx2i_ep = list_entry(pos, struct bnx2i_endpoint, link);
/* Clean up the chip only */
bnx2i_hw_ep_disconnect(bnx2i_ep);
}
mutex_unlock(&hba->net_dev_lock);
if (hba->ofld_conns_active)
printk(KERN_ERR "bnx2i: EP disconnect timeout (%d)!\n",
hba->ofld_conns_active);
}
/* This flag should be cleared last so that ep_disconnect() gracefully /* This flag should be cleared last so that ep_disconnect() gracefully
* cleans up connection context * cleans up connection context
@ -457,6 +470,7 @@ static void __exit bnx2i_mod_exit(void)
adapter_count--; adapter_count--;
if (test_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic)) { if (test_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic)) {
bnx2i_chip_cleanup(hba);
hba->cnic->unregister_device(hba->cnic, CNIC_ULP_ISCSI); hba->cnic->unregister_device(hba->cnic, CNIC_ULP_ISCSI);
clear_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic); clear_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic);
} }

3
drivers/scsi/bnx2i/bnx2i_iscsi.c
View File

@ -1953,6 +1953,9 @@ int bnx2i_hw_ep_disconnect(struct bnx2i_endpoint *bnx2i_ep)
if (!cnic) if (!cnic)
return 0; return 0;
if (bnx2i_ep->state == EP_STATE_IDLE)
return 0;
if (!bnx2i_ep_tcp_conn_active(bnx2i_ep)) if (!bnx2i_ep_tcp_conn_active(bnx2i_ep))
goto destroy_conn; goto destroy_conn;