openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] fnic: New debug flags and debug log messages 

Added new fnic debug flags for identifying IO state at every stage of IO while
debugging and also added more log messages for better debugging capability.

Signed-off-by: Sesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: Hiral Patel <hiralpat@cisco.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Hiral Patel 2013-02-12 17:01:01 -08:00 committed by James Bottomley
parent a0bf1ca27b
commit 14eb5d905d
3 changed files with 132 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/scsi/fnic/fnic.h
View File

@ -60,13 +60,28 @@
* use. * use.
*/ */
#define FNIC_NO_FLAGS 0 #define FNIC_NO_FLAGS 0
#define FNIC_CDB_REQ BIT(1) /* All IOs with a valid CDB */ #define FNIC_IO_INITIALIZED BIT(0)
#define FNIC_BLOCKING_REQ BIT(2) /* All blocking Requests */ #define FNIC_IO_ISSUED BIT(1)
#define FNIC_DEVICE_RESET BIT(3) /* Device reset request */ #define FNIC_IO_DONE BIT(2)
#define FNIC_DEV_RST_PENDING BIT(4) /* Device reset pending */ #define FNIC_IO_REQ_NULL BIT(3)
#define FNIC_DEV_RST_TIMED_OUT BIT(5) /* Device reset timed out */ #define FNIC_IO_ABTS_PENDING BIT(4)
#define FNIC_DEV_RST_TERM_ISSUED BIT(6) /* Device reset terminate */ #define FNIC_IO_ABORTED BIT(5)
#define FNIC_DEV_RST_DONE BIT(7) /* Device reset done */ #define FNIC_IO_ABTS_ISSUED BIT(6)
#define FNIC_IO_TERM_ISSUED BIT(7)
#define FNIC_IO_INTERNAL_TERM_ISSUED BIT(8)
#define FNIC_IO_ABT_TERM_DONE BIT(9)
#define FNIC_IO_ABT_TERM_REQ_NULL BIT(10)
#define FNIC_IO_ABT_TERM_TIMED_OUT BIT(11)
#define FNIC_DEVICE_RESET BIT(12) /* Device reset request */
#define FNIC_DEV_RST_ISSUED BIT(13)
#define FNIC_DEV_RST_TIMED_OUT BIT(14)
#define FNIC_DEV_RST_ABTS_ISSUED BIT(15)
#define FNIC_DEV_RST_TERM_ISSUED BIT(16)
#define FNIC_DEV_RST_DONE BIT(17)
#define FNIC_DEV_RST_REQ_NULL BIT(18)
#define FNIC_DEV_RST_ABTS_DONE BIT(19)
#define FNIC_DEV_RST_TERM_DONE BIT(20)
#define FNIC_DEV_RST_ABTS_PENDING BIT(21)
/* /*
* Usage of the scsi_cmnd scratchpad. * Usage of the scsi_cmnd scratchpad.

4
drivers/scsi/fnic/fnic_io.h
View File

@ -45,7 +45,8 @@ enum fnic_sgl_list_type {
}; };
enum fnic_ioreq_state { enum fnic_ioreq_state {
FNIC_IOREQ_CMD_PENDING = 0, FNIC_IOREQ_NOT_INITED = 0,
FNIC_IOREQ_CMD_PENDING,
FNIC_IOREQ_ABTS_PENDING, FNIC_IOREQ_ABTS_PENDING,
FNIC_IOREQ_ABTS_COMPLETE, FNIC_IOREQ_ABTS_COMPLETE,
FNIC_IOREQ_CMD_COMPLETE, FNIC_IOREQ_CMD_COMPLETE,
@ -60,6 +61,7 @@ struct fnic_io_req {
u8 sgl_type; /* device DMA descriptor list type */ u8 sgl_type; /* device DMA descriptor list type */
u8 io_completed:1; /* set to 1 when fw completes IO */ u8 io_completed:1; /* set to 1 when fw completes IO */
u32 port_id; /* remote port DID */ u32 port_id; /* remote port DID */
unsigned long start_time; /* in jiffies */
struct completion *abts_done; /* completion for abts */ struct completion *abts_done; /* completion for abts */
struct completion *dr_done; /* completion for device reset */ struct completion *dr_done; /* completion for device reset */
}; };

118
drivers/scsi/fnic/fnic_scsi.c
View File

@ -47,6 +47,7 @@ const char *fnic_state_str[] = {
}; };
static const char *fnic_ioreq_state_str[] = { static const char *fnic_ioreq_state_str[] = {
[FNIC_IOREQ_NOT_INITED] = "FNIC_IOREQ_NOT_INITED",
[FNIC_IOREQ_CMD_PENDING] = "FNIC_IOREQ_CMD_PENDING", [FNIC_IOREQ_CMD_PENDING] = "FNIC_IOREQ_CMD_PENDING",
[FNIC_IOREQ_ABTS_PENDING] = "FNIC_IOREQ_ABTS_PENDING", [FNIC_IOREQ_ABTS_PENDING] = "FNIC_IOREQ_ABTS_PENDING",
[FNIC_IOREQ_ABTS_COMPLETE] = "FNIC_IOREQ_ABTS_COMPLETE", [FNIC_IOREQ_ABTS_COMPLETE] = "FNIC_IOREQ_ABTS_COMPLETE",
@ -349,6 +350,8 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
if (unlikely(!vnic_wq_copy_desc_avail(wq))) { if (unlikely(!vnic_wq_copy_desc_avail(wq))) {
spin_unlock_irqrestore(&fnic->wq_copy_lock[0], intr_flags); spin_unlock_irqrestore(&fnic->wq_copy_lock[0], intr_flags);
FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host,
"fnic_queue_wq_copy_desc failure - no descriptors\n");
return SCSI_MLQUEUE_HOST_BUSY; return SCSI_MLQUEUE_HOST_BUSY;
} }
@ -420,7 +423,8 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_
* caller disabling them. * caller disabling them.
*/ */
spin_unlock(lp->host->host_lock); spin_unlock(lp->host->host_lock);
CMD_FLAGS(sc) = FNIC_CDB_REQ; CMD_STATE(sc) = FNIC_IOREQ_NOT_INITED;
CMD_FLAGS(sc) = FNIC_NO_FLAGS;
/* Get a new io_req for this SCSI IO */ /* Get a new io_req for this SCSI IO */
io_req = mempool_alloc(fnic->io_req_pool, GFP_ATOMIC); io_req = mempool_alloc(fnic->io_req_pool, GFP_ATOMIC);
@ -467,8 +471,10 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_
/* initialize rest of io_req */ /* initialize rest of io_req */
io_req->port_id = rport->port_id; io_req->port_id = rport->port_id;
io_req->start_time = jiffies;
CMD_STATE(sc) = FNIC_IOREQ_CMD_PENDING; CMD_STATE(sc) = FNIC_IOREQ_CMD_PENDING;
CMD_SP(sc) = (char *)io_req; CMD_SP(sc) = (char *)io_req;
CMD_FLAGS(sc) |= FNIC_IO_INITIALIZED;
sc->scsi_done = done; sc->scsi_done = done;
/* create copy wq desc and enqueue it */ /* create copy wq desc and enqueue it */
@ -490,6 +496,9 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_
fnic_release_ioreq_buf(fnic, io_req, sc); fnic_release_ioreq_buf(fnic, io_req, sc);
mempool_free(io_req, fnic->io_req_pool); mempool_free(io_req, fnic->io_req_pool);
} }
} else {
/* REVISIT: Use per IO lock in the final code */
CMD_FLAGS(sc) |= FNIC_IO_ISSUED;
} }
out: out:
atomic_dec(&fnic->in_flight); atomic_dec(&fnic->in_flight);
@ -694,10 +703,12 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic,
struct scsi_cmnd *sc; struct scsi_cmnd *sc;
unsigned long flags; unsigned long flags;
spinlock_t *io_lock; spinlock_t *io_lock;
unsigned long start_time;
/* Decode the cmpl description to get the io_req id */ /* Decode the cmpl description to get the io_req id */
fcpio_header_dec(&desc->hdr, &type, &hdr_status, &tag); fcpio_header_dec(&desc->hdr, &type, &hdr_status, &tag);
fcpio_tag_id_dec(&tag, &id); fcpio_tag_id_dec(&tag, &id);
icmnd_cmpl = &desc->u.icmnd_cmpl;
if (id >= FNIC_MAX_IO_REQ) { if (id >= FNIC_MAX_IO_REQ) {
shost_printk(KERN_ERR, fnic->lport->host, shost_printk(KERN_ERR, fnic->lport->host,
@ -708,17 +719,28 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic,
sc = scsi_host_find_tag(fnic->lport->host, id); sc = scsi_host_find_tag(fnic->lport->host, id);
WARN_ON_ONCE(!sc); WARN_ON_ONCE(!sc);
if (!sc) if (!sc) {
shost_printk(KERN_ERR, fnic->lport->host,
"icmnd_cmpl sc is null - "
"hdr status = %s tag = 0x%x desc = 0x%p\n",
fnic_fcpio_status_to_str(hdr_status), id, desc);
return; return;
}
io_lock = fnic_io_lock_hash(fnic, sc); io_lock = fnic_io_lock_hash(fnic, sc);
spin_lock_irqsave(io_lock, flags); spin_lock_irqsave(io_lock, flags);
io_req = (struct fnic_io_req *)CMD_SP(sc); io_req = (struct fnic_io_req *)CMD_SP(sc);
WARN_ON_ONCE(!io_req); WARN_ON_ONCE(!io_req);
if (!io_req) { if (!io_req) {
CMD_FLAGS(sc) |= FNIC_IO_REQ_NULL;
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
shost_printk(KERN_ERR, fnic->lport->host,
"icmnd_cmpl io_req is null - "
"hdr status = %s tag = 0x%x sc 0x%p\n",
fnic_fcpio_status_to_str(hdr_status), id, sc);
return; return;
} }
start_time = io_req->start_time;
/* firmware completed the io */ /* firmware completed the io */
io_req->io_completed = 1; io_req->io_completed = 1;
@ -729,6 +751,28 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic,
*/ */
if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) { if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) {
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
CMD_FLAGS(sc) |= FNIC_IO_ABTS_PENDING;
switch (hdr_status) {
case FCPIO_SUCCESS:
CMD_FLAGS(sc) |= FNIC_IO_DONE;
FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host,
"icmnd_cmpl ABTS pending hdr status = %s "
"sc 0x%p scsi_status %x residual %d\n",
fnic_fcpio_status_to_str(hdr_status), sc,
icmnd_cmpl->scsi_status,
icmnd_cmpl->residual);
break;
case FCPIO_ABORTED:
CMD_FLAGS(sc) |= FNIC_IO_ABORTED;
break;
default:
FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host,
"icmnd_cmpl abts pending "
"hdr status = %s tag = 0x%x sc = 0x%p\n",
fnic_fcpio_status_to_str(hdr_status),
id, sc);
break;
}
return; return;
} }
@ -812,6 +856,7 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic,
/* Break link with the SCSI command */ /* Break link with the SCSI command */
CMD_SP(sc) = NULL; CMD_SP(sc) = NULL;
CMD_FLAGS(sc) |= FNIC_IO_DONE;
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
@ -848,6 +893,7 @@ static void fnic_fcpio_itmf_cmpl_handler(struct fnic *fnic,
struct fnic_io_req *io_req; struct fnic_io_req *io_req;
unsigned long flags; unsigned long flags;
spinlock_t *io_lock; spinlock_t *io_lock;
unsigned long start_time;
fcpio_header_dec(&desc->hdr, &type, &hdr_status, &tag); fcpio_header_dec(&desc->hdr, &type, &hdr_status, &tag);
fcpio_tag_id_dec(&tag, &id); fcpio_tag_id_dec(&tag, &id);
@ -861,17 +907,26 @@ static void fnic_fcpio_itmf_cmpl_handler(struct fnic *fnic,
sc = scsi_host_find_tag(fnic->lport->host, id & FNIC_TAG_MASK); sc = scsi_host_find_tag(fnic->lport->host, id & FNIC_TAG_MASK);
WARN_ON_ONCE(!sc); WARN_ON_ONCE(!sc);
if (!sc) if (!sc) {
shost_printk(KERN_ERR, fnic->lport->host,
"itmf_cmpl sc is null - hdr status = %s tag = 0x%x\n",
fnic_fcpio_status_to_str(hdr_status), id);
return; return;
}
io_lock = fnic_io_lock_hash(fnic, sc); io_lock = fnic_io_lock_hash(fnic, sc);
spin_lock_irqsave(io_lock, flags); spin_lock_irqsave(io_lock, flags);
io_req = (struct fnic_io_req *)CMD_SP(sc); io_req = (struct fnic_io_req *)CMD_SP(sc);
WARN_ON_ONCE(!io_req); WARN_ON_ONCE(!io_req);
if (!io_req) { if (!io_req) {
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
CMD_FLAGS(sc) |= FNIC_IO_ABT_TERM_REQ_NULL;
shost_printk(KERN_ERR, fnic->lport->host,
"itmf_cmpl io_req is null - "
"hdr status = %s tag = 0x%x sc 0x%p\n",
fnic_fcpio_status_to_str(hdr_status), id, sc);
return; return;
} }
start_time = io_req->start_time;
if ((id & FNIC_TAG_ABORT) && (id & FNIC_TAG_DEV_RST)) { if ((id & FNIC_TAG_ABORT) && (id & FNIC_TAG_DEV_RST)) {
/* Abort and terminate completion of device reset req */ /* Abort and terminate completion of device reset req */
@ -895,6 +950,7 @@ static void fnic_fcpio_itmf_cmpl_handler(struct fnic *fnic,
CMD_STATE(sc) = FNIC_IOREQ_ABTS_COMPLETE; CMD_STATE(sc) = FNIC_IOREQ_ABTS_COMPLETE;
CMD_ABTS_STATUS(sc) = hdr_status; CMD_ABTS_STATUS(sc) = hdr_status;
CMD_FLAGS(sc) |= FNIC_IO_ABT_TERM_DONE;
FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
"abts cmpl recd. id %d status %s\n", "abts cmpl recd. id %d status %s\n",
(int)(id & FNIC_TAG_MASK), (int)(id & FNIC_TAG_MASK),
@ -927,6 +983,7 @@ static void fnic_fcpio_itmf_cmpl_handler(struct fnic *fnic,
CMD_LR_STATUS(sc) = hdr_status; CMD_LR_STATUS(sc) = hdr_status;
if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) { if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) {
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
CMD_FLAGS(sc) |= FNIC_DEV_RST_ABTS_PENDING;
FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
"Terminate pending " "Terminate pending "
"dev reset cmpl recd. id %d status %s\n", "dev reset cmpl recd. id %d status %s\n",
@ -1032,6 +1089,7 @@ static void fnic_cleanup_io(struct fnic *fnic, int exclude_id)
unsigned long flags = 0; unsigned long flags = 0;
struct scsi_cmnd *sc; struct scsi_cmnd *sc;
spinlock_t *io_lock; spinlock_t *io_lock;
unsigned long start_time = 0;
for (i = 0; i < FNIC_MAX_IO_REQ; i++) { for (i = 0; i < FNIC_MAX_IO_REQ; i++) {
if (i == exclude_id) if (i == exclude_id)
@ -1074,6 +1132,7 @@ static void fnic_cleanup_io(struct fnic *fnic, int exclude_id)
* If there is a scsi_cmnd associated with this io_req, then * If there is a scsi_cmnd associated with this io_req, then
* free the corresponding state * free the corresponding state
*/ */
start_time = io_req->start_time;
fnic_release_ioreq_buf(fnic, io_req, sc); fnic_release_ioreq_buf(fnic, io_req, sc);
mempool_free(io_req, fnic->io_req_pool); mempool_free(io_req, fnic->io_req_pool);
@ -1097,6 +1156,7 @@ void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy *wq,
struct scsi_cmnd *sc; struct scsi_cmnd *sc;
unsigned long flags; unsigned long flags;
spinlock_t *io_lock; spinlock_t *io_lock;
unsigned long start_time = 0;
/* get the tag reference */ /* get the tag reference */
fcpio_tag_id_dec(&desc->hdr.tag, &id); fcpio_tag_id_dec(&desc->hdr.tag, &id);
@ -1126,6 +1186,7 @@ void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy *wq,
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
start_time = io_req->start_time;
fnic_release_ioreq_buf(fnic, io_req, sc); fnic_release_ioreq_buf(fnic, io_req, sc);
mempool_free(io_req, fnic->io_req_pool); mempool_free(io_req, fnic->io_req_pool);
@ -1163,7 +1224,7 @@ static inline int fnic_queue_abort_io_req(struct fnic *fnic, int tag,
if (!vnic_wq_copy_desc_avail(wq)) { if (!vnic_wq_copy_desc_avail(wq)) {
spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags); spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags);
atomic_dec(&fnic->in_flight); atomic_dec(&fnic->in_flight);
shost_printk(KERN_DEBUG, fnic->lport->host, FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
"fnic_queue_abort_io_req: failure: no descriptors\n"); "fnic_queue_abort_io_req: failure: no descriptors\n");
return 1; return 1;
} }
@ -1213,7 +1274,7 @@ static void fnic_rport_exch_reset(struct fnic *fnic, u32 port_id)
} }
if ((CMD_FLAGS(sc) & FNIC_DEVICE_RESET) && if ((CMD_FLAGS(sc) & FNIC_DEVICE_RESET) &&
(!(CMD_FLAGS(sc) & FNIC_DEV_RST_PENDING))) { (!(CMD_FLAGS(sc) & FNIC_DEV_RST_ISSUED))) {
FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
"fnic_rport_exch_reset dev rst not pending sc 0x%p\n", "fnic_rport_exch_reset dev rst not pending sc 0x%p\n",
sc); sc);
@ -1236,6 +1297,13 @@ static void fnic_rport_exch_reset(struct fnic *fnic, u32 port_id)
fnic_ioreq_state_to_str(CMD_STATE(sc))); fnic_ioreq_state_to_str(CMD_STATE(sc)));
} }
if (!(CMD_FLAGS(sc) & FNIC_IO_ISSUED)) {
shost_printk(KERN_ERR, fnic->lport->host,
"rport_exch_reset "
"IO not yet issued %p tag 0x%x flags "
"%x state %d\n",
sc, tag, CMD_FLAGS(sc), CMD_STATE(sc));
}
old_ioreq_state = CMD_STATE(sc); old_ioreq_state = CMD_STATE(sc);
CMD_STATE(sc) = FNIC_IOREQ_ABTS_PENDING; CMD_STATE(sc) = FNIC_IOREQ_ABTS_PENDING;
CMD_ABTS_STATUS(sc) = FCPIO_INVALID_CODE; CMD_ABTS_STATUS(sc) = FCPIO_INVALID_CODE;
@ -1273,6 +1341,8 @@ static void fnic_rport_exch_reset(struct fnic *fnic, u32 port_id)
spin_lock_irqsave(io_lock, flags); spin_lock_irqsave(io_lock, flags);
if (CMD_FLAGS(sc) & FNIC_DEVICE_RESET) if (CMD_FLAGS(sc) & FNIC_DEVICE_RESET)
CMD_FLAGS(sc) |= FNIC_DEV_RST_TERM_ISSUED; CMD_FLAGS(sc) |= FNIC_DEV_RST_TERM_ISSUED;
else
CMD_FLAGS(sc) |= FNIC_IO_INTERNAL_TERM_ISSUED;
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
} }
} }
@ -1324,7 +1394,7 @@ void fnic_terminate_rport_io(struct fc_rport *rport)
} }
if ((CMD_FLAGS(sc) & FNIC_DEVICE_RESET) && if ((CMD_FLAGS(sc) & FNIC_DEVICE_RESET) &&
(!(CMD_FLAGS(sc) & FNIC_DEV_RST_PENDING))) { (!(CMD_FLAGS(sc) & FNIC_DEV_RST_ISSUED))) {
FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
"fnic_terminate_rport_io dev rst not pending sc 0x%p\n", "fnic_terminate_rport_io dev rst not pending sc 0x%p\n",
sc); sc);
@ -1345,6 +1415,13 @@ void fnic_terminate_rport_io(struct fc_rport *rport)
"state is %s\n", "state is %s\n",
fnic_ioreq_state_to_str(CMD_STATE(sc))); fnic_ioreq_state_to_str(CMD_STATE(sc)));
} }
if (!(CMD_FLAGS(sc) & FNIC_IO_ISSUED)) {
FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host,
"fnic_terminate_rport_io "
"IO not yet issued %p tag 0x%x flags "
"%x state %d\n",
sc, tag, CMD_FLAGS(sc), CMD_STATE(sc));
}
old_ioreq_state = CMD_STATE(sc); old_ioreq_state = CMD_STATE(sc);
CMD_STATE(sc) = FNIC_IOREQ_ABTS_PENDING; CMD_STATE(sc) = FNIC_IOREQ_ABTS_PENDING;
CMD_ABTS_STATUS(sc) = FCPIO_INVALID_CODE; CMD_ABTS_STATUS(sc) = FCPIO_INVALID_CODE;
@ -1382,6 +1459,8 @@ void fnic_terminate_rport_io(struct fc_rport *rport)
spin_lock_irqsave(io_lock, flags); spin_lock_irqsave(io_lock, flags);
if (CMD_FLAGS(sc) & FNIC_DEVICE_RESET) if (CMD_FLAGS(sc) & FNIC_DEVICE_RESET)
CMD_FLAGS(sc) |= FNIC_DEV_RST_TERM_ISSUED; CMD_FLAGS(sc) |= FNIC_DEV_RST_TERM_ISSUED;
else
CMD_FLAGS(sc) |= FNIC_IO_INTERNAL_TERM_ISSUED;
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
} }
} }
@ -1401,8 +1480,9 @@ int fnic_abort_cmd(struct scsi_cmnd *sc)
struct fc_rport *rport; struct fc_rport *rport;
spinlock_t *io_lock; spinlock_t *io_lock;
unsigned long flags; unsigned long flags;
unsigned long start_time = 0;
int ret = SUCCESS; int ret = SUCCESS;
u32 task_req; u32 task_req = 0;
struct scsi_lun fc_lun; struct scsi_lun fc_lun;
int tag; int tag;
DECLARE_COMPLETION_ONSTACK(tm_done); DECLARE_COMPLETION_ONSTACK(tm_done);
@ -1489,6 +1569,10 @@ int fnic_abort_cmd(struct scsi_cmnd *sc)
ret = FAILED; ret = FAILED;
goto fnic_abort_cmd_end; goto fnic_abort_cmd_end;
} }
if (task_req == FCPIO_ITMF_ABT_TASK)
CMD_FLAGS(sc) |= FNIC_IO_ABTS_ISSUED;
else
CMD_FLAGS(sc) |= FNIC_IO_TERM_ISSUED;
/* /*
* We queued an abort IO, wait for its completion. * We queued an abort IO, wait for its completion.
@ -1507,6 +1591,7 @@ int fnic_abort_cmd(struct scsi_cmnd *sc)
io_req = (struct fnic_io_req *)CMD_SP(sc); io_req = (struct fnic_io_req *)CMD_SP(sc);
if (!io_req) { if (!io_req) {
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
CMD_FLAGS(sc) |= FNIC_IO_ABT_TERM_REQ_NULL;
ret = FAILED; ret = FAILED;
goto fnic_abort_cmd_end; goto fnic_abort_cmd_end;
} }
@ -1515,6 +1600,7 @@ int fnic_abort_cmd(struct scsi_cmnd *sc)
/* fw did not complete abort, timed out */ /* fw did not complete abort, timed out */
if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) { if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) {
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
CMD_FLAGS(sc) |= FNIC_IO_ABT_TERM_TIMED_OUT;
ret = FAILED; ret = FAILED;
goto fnic_abort_cmd_end; goto fnic_abort_cmd_end;
} }
@ -1530,12 +1616,13 @@ int fnic_abort_cmd(struct scsi_cmnd *sc)
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
start_time = io_req->start_time;
fnic_release_ioreq_buf(fnic, io_req, sc); fnic_release_ioreq_buf(fnic, io_req, sc);
mempool_free(io_req, fnic->io_req_pool); mempool_free(io_req, fnic->io_req_pool);
fnic_abort_cmd_end: fnic_abort_cmd_end:
FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
"Returning from abort cmd %s\n", "Returning from abort cmd type %x %s\n", task_req,
(ret == SUCCESS) ? (ret == SUCCESS) ?
"SUCCESS" : "FAILED"); "SUCCESS" : "FAILED");
return ret; return ret;
@ -1566,6 +1653,8 @@ static inline int fnic_queue_dr_io_req(struct fnic *fnic,
free_wq_copy_descs(fnic, wq); free_wq_copy_descs(fnic, wq);
if (!vnic_wq_copy_desc_avail(wq)) { if (!vnic_wq_copy_desc_avail(wq)) {
FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
"queue_dr_io_req failure - no descriptors\n");
ret = -EAGAIN; ret = -EAGAIN;
goto lr_io_req_end; goto lr_io_req_end;
} }
@ -1637,7 +1726,7 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,
continue; continue;
} }
if ((CMD_FLAGS(sc) & FNIC_DEVICE_RESET) && if ((CMD_FLAGS(sc) & FNIC_DEVICE_RESET) &&
(!(CMD_FLAGS(sc) & FNIC_DEV_RST_PENDING))) { (!(CMD_FLAGS(sc) & FNIC_DEV_RST_ISSUED))) {
FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host, FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host,
"%s dev rst not pending sc 0x%p\n", __func__, "%s dev rst not pending sc 0x%p\n", __func__,
sc); sc);
@ -1693,6 +1782,7 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,
CMD_FLAGS(sc) |= FNIC_DEV_RST_TERM_ISSUED; CMD_FLAGS(sc) |= FNIC_DEV_RST_TERM_ISSUED;
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
} }
CMD_FLAGS(sc) |= FNIC_IO_INTERNAL_TERM_ISSUED;
wait_for_completion_timeout(&tm_done, wait_for_completion_timeout(&tm_done,
msecs_to_jiffies msecs_to_jiffies
@ -1703,6 +1793,7 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,
io_req = (struct fnic_io_req *)CMD_SP(sc); io_req = (struct fnic_io_req *)CMD_SP(sc);
if (!io_req) { if (!io_req) {
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
CMD_FLAGS(sc) |= FNIC_IO_ABT_TERM_REQ_NULL;
continue; continue;
} }
@ -1711,6 +1802,7 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,
/* if abort is still pending with fw, fail */ /* if abort is still pending with fw, fail */
if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) { if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) {
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
CMD_FLAGS(sc) |= FNIC_IO_ABT_TERM_DONE;
ret = 1; ret = 1;
goto clean_pending_aborts_end; goto clean_pending_aborts_end;
} }
@ -1805,6 +1897,7 @@ int fnic_device_reset(struct scsi_cmnd *sc)
int ret = FAILED; int ret = FAILED;
spinlock_t *io_lock; spinlock_t *io_lock;
unsigned long flags; unsigned long flags;
unsigned long start_time = 0;
struct scsi_lun fc_lun; struct scsi_lun fc_lun;
int tag; int tag;
DECLARE_COMPLETION_ONSTACK(tm_done); DECLARE_COMPLETION_ONSTACK(tm_done);
@ -1830,7 +1923,7 @@ int fnic_device_reset(struct scsi_cmnd *sc)
if (fc_remote_port_chkready(rport)) if (fc_remote_port_chkready(rport))
goto fnic_device_reset_end; goto fnic_device_reset_end;
CMD_FLAGS(sc) = (FNIC_DEVICE_RESET | FNIC_BLOCKING_REQ); CMD_FLAGS(sc) = FNIC_DEVICE_RESET;
/* Allocate tag if not present */ /* Allocate tag if not present */
tag = sc->request->tag; tag = sc->request->tag;
@ -1877,7 +1970,7 @@ int fnic_device_reset(struct scsi_cmnd *sc)
goto fnic_device_reset_clean; goto fnic_device_reset_clean;
} }
spin_lock_irqsave(io_lock, flags); spin_lock_irqsave(io_lock, flags);
CMD_FLAGS(sc) |= FNIC_DEV_RST_PENDING; CMD_FLAGS(sc) |= FNIC_DEV_RST_ISSUED;
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
/* /*
@ -1995,6 +2088,7 @@ int fnic_device_reset(struct scsi_cmnd *sc)
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
if (io_req) { if (io_req) {
start_time = io_req->start_time;
fnic_release_ioreq_buf(fnic, io_req, sc); fnic_release_ioreq_buf(fnic, io_req, sc);
mempool_free(io_req, fnic->io_req_pool); mempool_free(io_req, fnic->io_req_pool);
} }