Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 148061
b: refs/heads/master
c: b3cd505
h: refs/heads/master
i:
  148059: e58b6d7
v: v3
  • Loading branch information
Mike Christie authored and James Bottomley committed May 23, 2009
1 parent 701cf5e commit 7fd8d45
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 33 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1336aed10b8af791378b017f0fa8da4e5b827b8d
refs/heads/master: b3cd5050bf8eb32ceecee129cac7c59e6f1668c4
7 changes: 2 additions & 5 deletions trunk/drivers/infiniband/ulp/iser/iscsi_iser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,8 @@ static void iscsi_iser_cleanup_task(struct iscsi_task *task)
{
struct iscsi_iser_task *iser_task = task->dd_data;

/*
* mgmt tasks do not need special cleanup and we do not
* allocate anything in the init task callout
*/
if (!task->sc || task->state == ISCSI_TASK_PENDING)
/* mgmt tasks do not need special cleanup */
if (!task->sc)
return;

if (iser_task->status == ISER_TASK_STATUS_STARTED) {
Expand Down
60 changes: 35 additions & 25 deletions trunk/drivers/scsi/libiscsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,18 +443,20 @@ EXPORT_SYMBOL_GPL(iscsi_put_task);
/**
* iscsi_complete_task - finish a task
* @task: iscsi cmd task
* @state: state to complete task with
*
* Must be called with session lock.
*/
static void iscsi_complete_task(struct iscsi_task *task)
static void iscsi_complete_task(struct iscsi_task *task, int state)
{
struct iscsi_conn *conn = task->conn;

if (task->state == ISCSI_TASK_COMPLETED)
if (task->state == ISCSI_TASK_COMPLETED ||
task->state == ISCSI_TASK_ABRT_TMF ||
task->state == ISCSI_TASK_ABRT_SESS_RECOV)
return;
WARN_ON_ONCE(task->state == ISCSI_TASK_FREE);

task->state = ISCSI_TASK_COMPLETED;
task->state = state;

if (!list_empty(&task->running))
list_del_init(&task->running);
Expand All @@ -478,6 +480,7 @@ static void fail_scsi_task(struct iscsi_task *task, int err)
{
struct iscsi_conn *conn = task->conn;
struct scsi_cmnd *sc;
int state;

/*
* if a command completes and we get a successful tmf response
Expand All @@ -488,22 +491,28 @@ static void fail_scsi_task(struct iscsi_task *task, int err)
if (!sc)
return;

if (task->state == ISCSI_TASK_PENDING)
if (task->state == ISCSI_TASK_PENDING) {
/*
* cmd never made it to the xmit thread, so we should not count
* the cmd in the sequencing
*/
conn->session->queued_cmdsn--;
/* it was never sent so just complete like normal */
state = ISCSI_TASK_COMPLETED;
} else if (err == DID_TRANSPORT_DISRUPTED)
state = ISCSI_TASK_ABRT_SESS_RECOV;
else
state = ISCSI_TASK_ABRT_TMF;

sc->result = err;
sc->result = err << 16;
if (!scsi_bidi_cmnd(sc))
scsi_set_resid(sc, scsi_bufflen(sc));
else {
scsi_out(sc)->resid = scsi_out(sc)->length;
scsi_in(sc)->resid = scsi_in(sc)->length;
}

iscsi_complete_task(task);
iscsi_complete_task(task, state);
}

static int iscsi_prep_mgmt_task(struct iscsi_conn *conn,
Expand Down Expand Up @@ -731,7 +740,7 @@ static void iscsi_scsi_cmd_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
ISCSI_DBG_SESSION(session, "cmd rsp done [sc %p res %d itt 0x%x]\n",
sc, sc->result, task->itt);
conn->scsirsp_pdus_cnt++;
iscsi_complete_task(task);
iscsi_complete_task(task, ISCSI_TASK_COMPLETED);
}

/**
Expand Down Expand Up @@ -769,7 +778,7 @@ iscsi_data_in_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
"[sc %p res %d itt 0x%x]\n",
sc, sc->result, task->itt);
conn->scsirsp_pdus_cnt++;
iscsi_complete_task(task);
iscsi_complete_task(task, ISCSI_TASK_COMPLETED);
}

static void iscsi_tmf_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
Expand Down Expand Up @@ -990,7 +999,7 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
}

iscsi_tmf_rsp(conn, hdr);
iscsi_complete_task(task);
iscsi_complete_task(task, ISCSI_TASK_COMPLETED);
break;
case ISCSI_OP_NOOP_IN:
iscsi_update_cmdsn(session, (struct iscsi_nopin*)hdr);
Expand All @@ -1008,7 +1017,7 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
goto recv_pdu;

mod_timer(&conn->transport_timer, jiffies + conn->recv_timeout);
iscsi_complete_task(task);
iscsi_complete_task(task, ISCSI_TASK_COMPLETED);
break;
default:
rc = ISCSI_ERR_BAD_OPCODE;
Expand All @@ -1020,7 +1029,7 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
recv_pdu:
if (iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen))
rc = ISCSI_ERR_CONN_FAILED;
iscsi_complete_task(task);
iscsi_complete_task(task, ISCSI_TASK_COMPLETED);
return rc;
}
EXPORT_SYMBOL_GPL(__iscsi_complete_pdu);
Expand Down Expand Up @@ -1262,7 +1271,7 @@ static int iscsi_data_xmit(struct iscsi_conn *conn)
struct iscsi_task, running);
list_del_init(&conn->task->running);
if (conn->session->state == ISCSI_STATE_LOGGING_OUT) {
fail_scsi_task(conn->task, DID_IMM_RETRY << 16);
fail_scsi_task(conn->task, DID_IMM_RETRY);
continue;
}
rc = iscsi_prep_scsi_cmd_pdu(conn->task);
Expand All @@ -1273,7 +1282,7 @@ static int iscsi_data_xmit(struct iscsi_conn *conn)
conn->task = NULL;
goto again;
} else
fail_scsi_task(conn->task, DID_ABORT << 16);
fail_scsi_task(conn->task, DID_ABORT);
continue;
}
rc = iscsi_xmit_task(conn);
Expand Down Expand Up @@ -1469,7 +1478,7 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))

prepd_reject:
sc->scsi_done = NULL;
iscsi_complete_task(task);
iscsi_complete_task(task, ISCSI_TASK_COMPLETED);
reject:
spin_unlock(&session->lock);
ISCSI_DBG_SESSION(session, "cmd 0x%x rejected (%d)\n",
Expand All @@ -1479,7 +1488,7 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))

prepd_fault:
sc->scsi_done = NULL;
iscsi_complete_task(task);
iscsi_complete_task(task, ISCSI_TASK_COMPLETED);
fault:
spin_unlock(&session->lock);
ISCSI_DBG_SESSION(session, "iscsi: cmd 0x%x is not queued (%d)\n",
Expand Down Expand Up @@ -1665,7 +1674,7 @@ static void fail_scsi_tasks(struct iscsi_conn *conn, unsigned lun,
ISCSI_DBG_SESSION(conn->session,
"failing sc %p itt 0x%x state %d\n",
task->sc, task->itt, task->state);
fail_scsi_task(task, error << 16);
fail_scsi_task(task, error);
}
}

Expand Down Expand Up @@ -1868,7 +1877,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
}

if (task->state == ISCSI_TASK_PENDING) {
fail_scsi_task(task, DID_ABORT << 16);
fail_scsi_task(task, DID_ABORT);
goto success;
}

Expand Down Expand Up @@ -1899,7 +1908,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
* then sent more data for the cmd.
*/
spin_lock(&session->lock);
fail_scsi_task(task, DID_ABORT << 16);
fail_scsi_task(task, DID_ABORT);
conn->tmf_state = TMF_INITIAL;
spin_unlock(&session->lock);
iscsi_start_tx(conn);
Expand Down Expand Up @@ -2572,7 +2581,7 @@ static void
fail_mgmt_tasks(struct iscsi_session *session, struct iscsi_conn *conn)
{
struct iscsi_task *task;
int i;
int i, state;

for (i = 0; i < conn->session->cmds_max; i++) {
task = conn->session->cmds[i];
Expand All @@ -2585,7 +2594,11 @@ fail_mgmt_tasks(struct iscsi_session *session, struct iscsi_conn *conn)
ISCSI_DBG_SESSION(conn->session,
"failing mgmt itt 0x%x state %d\n",
task->itt, task->state);
iscsi_complete_task(task);
state = ISCSI_TASK_ABRT_SESS_RECOV;
if (task->state == ISCSI_TASK_PENDING)
state = ISCSI_TASK_COMPLETED;
iscsi_complete_task(task, state);

}
}

Expand Down Expand Up @@ -2642,10 +2655,7 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
* flush queues.
*/
spin_lock_bh(&session->lock);
if (flag == STOP_CONN_RECOVER)
fail_scsi_tasks(conn, -1, DID_TRANSPORT_DISRUPTED);
else
fail_scsi_tasks(conn, -1, DID_ERROR);
fail_scsi_tasks(conn, -1, DID_TRANSPORT_DISRUPTED);
fail_mgmt_tasks(session, conn);
spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/scsi/libiscsi_tcp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,8 @@ void iscsi_tcp_cleanup_task(struct iscsi_task *task)
struct iscsi_tcp_task *tcp_task = task->dd_data;
struct iscsi_r2t_info *r2t;

/* nothing to do for mgmt or pending tasks */
if (!task->sc || task->state == ISCSI_TASK_PENDING)
/* nothing to do for mgmt */
if (!task->sc)
return;

/* flush task's r2t queues */
Expand Down
2 changes: 2 additions & 0 deletions trunk/include/scsi/libiscsi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ enum {
ISCSI_TASK_COMPLETED,
ISCSI_TASK_PENDING,
ISCSI_TASK_RUNNING,
ISCSI_TASK_ABRT_TMF, /* aborted due to TMF */
ISCSI_TASK_ABRT_SESS_RECOV, /* aborted due to session recovery */
};

struct iscsi_r2t_info {
Expand Down

0 comments on commit 7fd8d45

Please sign in to comment.