diff options
author | Jayamohan Kallickal <jayamohank@gmail.com> | 2013-04-05 20:38:31 -0700 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-02 08:14:07 -0700 |
commit | 4a4a11b98a39f479cdccef879635a72b0422049b (patch) | |
tree | 6258c5bb957ce940c6f0be9ab9c8eb1e8d6f121b /drivers/scsi/be2iscsi/be_main.c | |
parent | 6ea9b3b0337d55c901cea38e2d85103e2268d757 (diff) | |
download | linux-4a4a11b98a39f479cdccef879635a72b0422049b.tar.bz2 |
[SCSI] be2iscsi : Fix the NOP-In handling code path
When target send a NOP-IN with valid TTT, driver issues a NOP-OUT
and the task was not freed from driver. The task list available for
the session used to run out, and as no more task list were available
no more iSCSI commands were exchanged on that session.
This patches fixed the issue, by calling iscsi_put_task.
Signed-off-by: Minh Tran <minhduc.tran@emulex.com>
Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/be2iscsi/be_main.c')
-rw-r--r-- | drivers/scsi/be2iscsi/be_main.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index ff89b4cc3634..a60a43d4d947 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -1367,8 +1367,6 @@ hwi_complete_drvr_msgs(struct beiscsi_conn *beiscsi_conn, struct hwi_controller *phwi_ctrlr; struct iscsi_task *task; struct beiscsi_io_task *io_task; - struct iscsi_conn *conn = beiscsi_conn->conn; - struct iscsi_session *session = conn->session; uint16_t wrb_index, cid; phwi_ctrlr = phba->phwi_ctrlr; @@ -1390,12 +1388,8 @@ hwi_complete_drvr_msgs(struct beiscsi_conn *beiscsi_conn, task = pwrb_handle->pio_handle; io_task = task->dd_data; - spin_lock_bh(&phba->mgmt_sgl_lock); - free_mgmt_sgl_handle(phba, io_task->psgl_handle); - spin_unlock_bh(&phba->mgmt_sgl_lock); - spin_lock_bh(&session->lock); - free_wrb_handle(phba, pwrb_context, pwrb_handle); - spin_unlock_bh(&session->lock); + memset(io_task->pwrb_handle->pwrb, 0, sizeof(struct iscsi_wrb)); + iscsi_put_task(task); } static void @@ -4073,11 +4067,13 @@ static void beiscsi_clean_port(struct beiscsi_hba *phba) /** * beiscsi_free_mgmt_task_handles()- Free driver CXN resources * @beiscsi_conn: ptr to the conn to be cleaned up + * @task: ptr to iscsi_task resource to be freed. * * Free driver mgmt resources binded to CXN. **/ void -beiscsi_free_mgmt_task_handles(struct beiscsi_conn *beiscsi_conn) +beiscsi_free_mgmt_task_handles(struct beiscsi_conn *beiscsi_conn, + struct iscsi_task *task) { struct beiscsi_io_task *io_task; struct beiscsi_hba *phba = beiscsi_conn->phba; @@ -4088,7 +4084,7 @@ beiscsi_free_mgmt_task_handles(struct beiscsi_conn *beiscsi_conn) pwrb_context = &phwi_ctrlr->wrb_context [beiscsi_conn->beiscsi_conn_cid - phba->fw_config.iscsi_cid_start]; - io_task = beiscsi_conn->task->dd_data; + io_task = task->dd_data; if (io_task->pwrb_handle) { memset(io_task->pwrb_handle->pwrb, 0, @@ -4102,8 +4098,8 @@ beiscsi_free_mgmt_task_handles(struct beiscsi_conn *beiscsi_conn) spin_lock_bh(&phba->mgmt_sgl_lock); free_mgmt_sgl_handle(phba, io_task->psgl_handle); - spin_unlock_bh(&phba->mgmt_sgl_lock); io_task->psgl_handle = NULL; + spin_unlock_bh(&phba->mgmt_sgl_lock); } if (io_task->mtask_addr) @@ -4153,7 +4149,7 @@ static void beiscsi_cleanup_task(struct iscsi_task *task) } } else { if (!beiscsi_conn->login_in_progress) - beiscsi_free_mgmt_task_handles(beiscsi_conn); + beiscsi_free_mgmt_task_handles(beiscsi_conn, task); } } @@ -4381,7 +4377,6 @@ int beiscsi_iotask_v2(struct iscsi_task *task, struct scatterlist *sg, unsigned int doorbell = 0; pwrb = io_task->pwrb_handle->pwrb; - memset(pwrb, 0, sizeof(*pwrb)); io_task->cmd_bhs->iscsi_hdr.exp_statsn = 0; io_task->bhs_len = sizeof(struct be_cmd_bhs); |