Commit 96b1765a authored by Chad Dupuis's avatar Chad Dupuis Committed by Martin K. Petersen

scsi: qedf: Use a separate completion for cleanup commands

 - If a TMF and cleanup are issued at the same time they could cause a call
   trace if issued against the same xid as the io_req->tm_done completion
   is used for both.

 - Set and clear cleanup bit in cleanup routine.
Signed-off-by: default avatarChad Dupuis <cdupuis@marvell.com>
Signed-off-by: default avatarSaurav Kashyap <skashyap@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 69ef2c69
...@@ -128,6 +128,7 @@ struct qedf_ioreq { ...@@ -128,6 +128,7 @@ struct qedf_ioreq {
struct delayed_work timeout_work; struct delayed_work timeout_work;
struct completion tm_done; struct completion tm_done;
struct completion abts_done; struct completion abts_done;
struct completion cleanup_done;
struct e4_fcoe_task_context *task; struct e4_fcoe_task_context *task;
struct fcoe_task_params *task_params; struct fcoe_task_params *task_params;
struct scsi_sgl_task_params *sgl_task_params; struct scsi_sgl_task_params *sgl_task_params;
......
...@@ -2065,10 +2065,13 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req, ...@@ -2065,10 +2065,13 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req,
io_req->xid); io_req->xid);
return SUCCESS; return SUCCESS;
} }
set_bit(QEDF_CMD_IN_CLEANUP, &io_req->flags);
/* Ensure room on SQ */ /* Ensure room on SQ */
if (!atomic_read(&fcport->free_sqes)) { if (!atomic_read(&fcport->free_sqes)) {
QEDF_ERR(&(qedf->dbg_ctx), "No SQ entries available\n"); QEDF_ERR(&(qedf->dbg_ctx), "No SQ entries available\n");
/* Need to make sure we clear the flag since it was set */
clear_bit(QEDF_CMD_IN_CLEANUP, &io_req->flags);
return FAILED; return FAILED;
} }
...@@ -2094,7 +2097,7 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req, ...@@ -2094,7 +2097,7 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req,
task = qedf_get_task_mem(&qedf->tasks, xid); task = qedf_get_task_mem(&qedf->tasks, xid);
init_completion(&io_req->tm_done); init_completion(&io_req->cleanup_done);
spin_lock_irqsave(&fcport->rport_lock, flags); spin_lock_irqsave(&fcport->rport_lock, flags);
...@@ -2108,7 +2111,7 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req, ...@@ -2108,7 +2111,7 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req,
spin_unlock_irqrestore(&fcport->rport_lock, flags); spin_unlock_irqrestore(&fcport->rport_lock, flags);
tmo = wait_for_completion_timeout(&io_req->tm_done, tmo = wait_for_completion_timeout(&io_req->cleanup_done,
QEDF_CLEANUP_TIMEOUT * HZ); QEDF_CLEANUP_TIMEOUT * HZ);
if (!tmo) { if (!tmo) {
...@@ -2153,7 +2156,7 @@ void qedf_process_cleanup_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, ...@@ -2153,7 +2156,7 @@ void qedf_process_cleanup_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,
clear_bit(QEDF_CMD_IN_CLEANUP, &io_req->flags); clear_bit(QEDF_CMD_IN_CLEANUP, &io_req->flags);
/* Complete so we can finish cleaning up the I/O */ /* Complete so we can finish cleaning up the I/O */
complete(&io_req->tm_done); complete(&io_req->cleanup_done);
} }
static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment