- Drivers/transports that want to send a synchronous REQUEST_SENSE command
as part of their .queuecommand sequence, have 2 new API's that facilitate
in doing so and abstract them from scsi-ml internals.
void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd,
struct scsi_eh_save_cmnd_info *sesci, unsigned char *cmnd,
int cmnd_size, int copy_sense) -
Will hijack a command and prepare it for request sense if needed.
And will save any later needed info into a scsi_eh_save_cmnd_info
structure.
void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd,
struct scsi_eh_save_cmnd_info *sesci);
Will undo any changes done to a command by above function. Making
it ready for completion.
- Re-factor scsi_send_eh_cmnd to use above APIs
Sign-off-by Boaz Harrosh <bharrosh@xxxxxxxxxxx>
---
drivers/scsi/scsi_error.c | 133 +++++++++++++++++++++++++++------------------
include/scsi/scsi_eh.h | 23 ++++++++-
2 files changed, 102 insertions(+), 54 deletions(-)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 0bcfbe5..0327e20 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -590,42 +590,24 @@ static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd)
}
/**
- * scsi_send_eh_cmnd - submit a scsi command as part of error recory
+ * scsi_prep_eh_cmnd - Save a scsi command info as part of error recory
* @scmd: SCSI command structure to hijack
- * @cmnd: CDB to send
+ * @sesci structure to save restore information
+ * @cmnd: CDB to send. Can be NULL if no new cmnd is needed
* @cmnd_size: size in bytes of @cmnd
- * @timeout: timeout for this request
* @copy_sense: request sense data if set to 1
*
- * This function is used to send a scsi command down to a target device
- * as part of the error recovery process. If @copy_sense is 0 the command
- * sent must be one that does not transfer any data. If @copy_sense is 1
- * the command must be REQUEST_SENSE and this functions copies out the
- * sense buffer it got into @scmd->sense_buffer.
- *
- * Return value:
- * SUCCESS or FAILED or NEEDS_RETRY
+ * This function is used to save a scsi command information before re-execution
+ * as part of an error recovery process. If @copy_sense is 0 the command
+ * given must be one that does not transfer any data. If @copy_sense is 1
+ * the command must be REQUEST_SENSE and this functions sets up the
+ * command buffers to be read into @scmd->sense_buffer.
**/
-static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
- int cmnd_size, int timeout, int copy_sense)
+void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd,
+ struct scsi_eh_save_cmnd_info *sesci, unsigned char *cmnd,
+ int cmnd_size, int copy_sense)
{
struct scsi_device *sdev = scmd->device;
- struct Scsi_Host *shost = sdev->host;
- DECLARE_COMPLETION_ONSTACK(done);
- unsigned long timeleft;
- unsigned long flags;
-
- unsigned char old_cmd_len;
- unsigned char old_cmnd[MAX_COMMAND_SIZE];
- enum dma_data_direction old_data_direction;
- unsigned old_bufflen;
- void *old_buffer;
- unsigned short old_use_sg;
- int old_resid;
- int old_result;
-
- struct scatterlist sgl;
- int rtn;
/*
* We need saved copies of a number of fields - this is because
@@ -634,14 +616,14 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
* we will need to restore these values prior to running the actual
* command.
*/
- old_cmd_len = scmd->cmd_len;
- memcpy(old_cmnd, scmd->cmnd, sizeof(scmd->cmnd));
- old_data_direction = scmd->sc_data_direction;
- old_bufflen = scmd->request_bufflen;
- old_buffer = scmd->request_buffer;
- old_use_sg = scmd->use_sg;
- old_resid = scmd->resid;
- old_result = scmd->result;
+ sesci->old_cmd_len = scmd->cmd_len;
+ memcpy(sesci->old_cmnd, scmd->cmnd, sizeof(scmd->cmnd));
+ sesci->old_data_direction = scmd->sc_data_direction;
+ sesci->old_bufflen = scmd->request_bufflen;
+ sesci->old_buffer = scmd->request_buffer;
+ sesci->old_use_sg = scmd->use_sg;
+ sesci->old_resid = scmd->resid;
+ sesci->old_result = scmd->result;
if (cmnd) {
memset(scmd->cmnd, 0, sizeof(scmd->cmnd));
@@ -650,14 +632,15 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
}
if (copy_sense) {
- sg_init_one(&sgl, scmd->sense_buffer,
+ struct scatterlist* sgl = &sesci->sense_sgl;
+ sg_init_one(sgl, scmd->sense_buffer,
sizeof(scmd->sense_buffer));
scmd->sc_data_direction = DMA_FROM_DEVICE;
- scmd->request_bufflen = sgl.length;
- scmd->request_buffer = &sgl;
+ scmd->request_bufflen = sgl->length;
+ scmd->request_buffer = sgl;
scmd->use_sg = 1;
- scmd->cmnd[4] = sgl.length;
+ scmd->cmnd[4] = sgl->length;
} else {
scmd->request_buffer = NULL;
scmd->request_bufflen = 0;
@@ -676,7 +659,62 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
* untransferred sense data should be interpreted as being zero.
*/
memset(scmd->sense_buffer, 0, sizeof(scmd->sense_buffer));
+}
+EXPORT_SYMBOL(scsi_eh_prep_cmnd);
+/**
+ * scsi_restore_eh_cmnd - Restore a scsi command info as part of error recory
+ * @scmd: SCSI command structure to restore
+ * @sesci saved information from a coresponding call to scsi_prep_eh_cmnd
+ *
+ * Undo any damage done by above scsi_prep_eh_cmnd().
+ **/
+void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd,
+ struct scsi_eh_save_cmnd_info *sesci)
+{
+ /*
+ * Restore original data
+ */
+ scmd->cmd_len = sesci->old_cmd_len;
+ memcpy(scmd->cmnd, sesci->old_cmnd, sizeof(scmd->cmnd));
+ scmd->sc_data_direction = sesci->old_data_direction;
+ scmd->request_bufflen = sesci->old_bufflen;
+ scmd->request_buffer = sesci->old_buffer;
+ scmd->use_sg = sesci->old_use_sg;
+ scmd->resid = sesci->old_resid;
+ scmd->result = sesci->old_result;
+}
+EXPORT_SYMBOL(scsi_eh_restore_cmnd);
+
+/**
+ * scsi_send_eh_cmnd - submit a scsi command as part of error recory
+ * @scmd: SCSI command structure to hijack
+ * @cmnd: CDB to send
+ * @cmnd_size: size in bytes of @cmnd
+ * @timeout: timeout for this request
+ * @copy_sense: request sense data if set to 1
+ *
+ * This function is used to send a scsi command down to a target device
+ * as part of the error recovery process. If @copy_sense is 0 the command
+ * sent must be one that does not transfer any data. If @copy_sense is 1
+ * the command must be REQUEST_SENSE and this functions copies out the
+ * sense buffer it got into @scmd->sense_buffer.
+ *
+ * Return value:
+ * SUCCESS or FAILED or NEEDS_RETRY
+ **/
+static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
+ int cmnd_size, int timeout, int copy_sense)
+{
+ struct scsi_device *sdev = scmd->device;
+ struct Scsi_Host *shost = sdev->host;
+ DECLARE_COMPLETION_ONSTACK(done);
+ unsigned long timeleft;
+ unsigned long flags;
+ struct scsi_eh_save_cmnd_info sesci;
+ int rtn;
+
+ scsi_eh_prep_cmnd(scmd, &sesci, cmnd, cmnd_size, copy_sense);
shost->eh_action = &done;
spin_lock_irqsave(shost->host_lock, flags);
@@ -720,18 +758,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
rtn = FAILED;
}
-
- /*
- * Restore original data
- */
- scmd->cmd_len = old_cmd_len;
- memcpy(scmd->cmnd, old_cmnd, sizeof(scmd->cmnd));
- scmd->sc_data_direction = old_data_direction;
- scmd->request_bufflen = old_bufflen;
- scmd->request_buffer = old_buffer;
- scmd->use_sg = old_use_sg;
- scmd->resid = old_resid;
- scmd->result = old_result;
+ scsi_eh_restore_cmnd(scmd, &sesci);
return rtn;
}
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index c5c0f67..07982b0 100644
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -1,7 +1,7 @@
#ifndef _SCSI_SCSI_EH_H
#define _SCSI_SCSI_EH_H
-struct scsi_cmnd;
+#include <scsi/scsi_cmnd.h>
struct scsi_device;
struct Scsi_Host;
@@ -65,4 +65,25 @@ extern int scsi_get_sense_info_fld(const u8 * sense_buffer, int sb_len,
extern int scsi_reset_provider(struct scsi_device *, int);
+struct scsi_eh_save_cmnd_info {
+ int old_result;
+ enum dma_data_direction old_data_direction;
+ unsigned char old_cmd_len;
+ unsigned char old_cmnd[MAX_COMMAND_SIZE];
+
+ void* old_buffer;
+ unsigned old_bufflen;
+ unsigned short old_use_sg;
+ int old_resid;
+
+ struct scatterlist sense_sgl;
+};
+
+extern void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd,
+ struct scsi_eh_save_cmnd_info *sesci, unsigned char *cmnd,
+ int cmnd_size, int copy_sense);
+
+extern void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd,
+ struct scsi_eh_save_cmnd_info *sesci);
+
#endif /* _SCSI_SCSI_EH_H */
--
1.5.3.1
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
