[PATCHv4 0/8]
Subsystems (3)
v4 cover [PATCHv4 0/8]
Hi all,
this is a resend of a small patchset for cleaning up SCSI EH. Primary goal is to make asynchronous aborts mandatory; there hasn't been a single report so far where asynchronous abort won't work, so the 'no_async_abort' flag has never been used and will be removed with this patchset.
Additionally there's a cleanup to detect retries of failed commands and to inline commands aborts.
I've also included the patch to correctly reset the media access timeout counter to avoid it being triggered inadvertedly by several commands timing out for the same device.
As usual, comments and reviews are welcome.
Changes to v1:
- Include reviews from Christoph
Changes to v2:
- Include reviews from Bart
- Add medium access timeout patch
Changes to v3:
- Add patch to inline command abort as per suggestion from Christoph
- Drop patch to not escalate failed EH commands
Christoph Hellwig (1):
libsas: allow async aborts
Hannes Reinecke (7):
scsi_error: count medium access timeout only once per EH run
sd: Return SUCCESS in sd_eh_action() after device offline
scsi: always send command aborts
scsi: make eh_eflags persistent
scsi: make scsi_eh_scmd_add() always succeed
scsi: make asynchronous aborts mandatory
scsi: inline command aborts
Documentation/scsi/scsi_eh.txt | 30 ++--- drivers/scsi/libsas/sas_scsi_host.c | 5 - drivers/scsi/scsi.c | 2 - drivers/scsi/scsi_error.c | 223 ++++++++++++------------------------ drivers/scsi/scsi_lib.c | 6 +- drivers/scsi/scsi_priv.h | 4 +- drivers/scsi/sd.c | 24 +++- drivers/scsi/sd.h | 1 + include/scsi/scsi_driver.h | 2 +- include/scsi/scsi_eh.h | 1 + include/scsi/scsi_host.h | 5 - 11 files changed, 111 insertions(+), 192 deletions(-)
Signature · 1 line
1.8.5.6
PATCH v4 1/8 scsi_error: count medium access timeout only once per EH run
The current medium access timeout counter will be increased for each command, so if there are enough failed commands we'll hit the medium access timeout for even a single device failure and the following kernel message is displayed:
sd H:C:T:L: [sdXY] Medium access timeout failure. Offlining disk!
Fix this by making the timeout per EH run, ie the counter will only be increased once per device and EH run.
Fixes 18a4d0a ("[SCSI] Handle disk devices which can not process medium access commands")
Cc Ewan Milne <[email protected]>
Cc Lawrence Obermann <[email protected]>
Cc Benjamin Block <[email protected]>
Cc Steffen Maier <[email protected]>
Signed-off-by Hannes Reinecke <[email protected]>
--- drivers/scsi/scsi_error.c | 23 ++++++++++++++++++++++- drivers/scsi/sd.c | 22 ++++++++++++++++++---- drivers/scsi/sd.h | 1 + include/scsi/scsi_driver.h | 2 +- 4 files changed, 42 insertions(+), 6 deletions(-)
drivers/scsi/scsi_error.c +22 -1
@@ -221,6 +221,26 @@ static int scsi_host_eh_past_deadline(struct Scsi_Host *shost) }/** +* scsi_eh_reset - call into ->eh_action to reset internal counters +* @scmd: scmd to run eh on. +* +* The scsi driver might be carrying internal state about the +* devices, so we need to call into the driver to reset the +* internal state once the error handler is started. +*/ +static int scsi_eh_reset (struct scsi_cmnd *scmd) +{ +int rtn =SUCCESS ; + +if (!blk_rq_is_passthrough (scmd->request)) { +struct scsi_driver *sdrv =scsi_cmd_to_driver (scmd); +if (sdrv->eh_action) + rtn = sdrv->eh_action (scmd, rtn, true); + } +return rtn; +} + +/** * scsi_eh_scmd_add - add scsi cmd to error handling. * @scmd: scmd to run eh on. * @eh_flag: optional SCSI_EH flag.
@@ -249,6 +269,7 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag)if (scmd->eh_eflags &SCSI_EH_ABORT_SCHEDULED ) eh_flag &= ~SCSI_EH_CANCEL_CMD ; scmd->eh_eflags |= eh_flag; +scsi_eh_reset (scmd);list_add_tail (&scmd->eh_entry, &shost->eh_cmd_q); shost->host_failed++;scsi_eh_wakeup (shost);
@@ -1107,7 +1128,7 @@ static int scsi_eh_action(struct scsi_cmnd *scmd, int rtn)if (!blk_rq_is_passthrough (scmd->request)) {struct scsi_driver *sdrv =scsi_cmd_to_driver (scmd);if (sdrv->eh_action) - rtn = sdrv->eh_action (scmd, rtn); + rtn = sdrv->eh_action (scmd, rtn, false); }return rtn; }
drivers/scsi/sd.c +18 -4
@@ -115,7 +115,7 @@static int sd_init_command (struct scsi_cmnd *SCpnt);static void sd_uninit_command (struct scsi_cmnd *SCpnt);static int sd_done (struct scsi_cmnd *); -static int sd_eh_action (struct scsi_cmnd *,int ); +static int sd_eh_action (struct scsi_cmnd *,int ,bool );static void sd_read_capacity (struct scsi_disk *sdkp,unsigned char *buffer);static void scsi_disk_release (struct device *cdev);static void sd_print_sense_hdr (struct scsi_disk *,struct scsi_sense_hdr *);
@@ -1689,18 +1689,29 @@ static int sd_pr_clear(struct block_device *bdev, u64 key)* sd_eh_action - error handling callback * @scmd: sd-issued command that has failed * @eh_disp: The recovery disposition suggested by the midlayer +* @restart: SCSI EH has been restarted * * This function is called by the SCSI midlayer upon completion of an * error test command (currently TEST UNIT READY). The result of sending * the eh command is passed in eh_disp. We're looking for devices that * fail medium access commands but are OK with non access commands like * test unit ready (so wrongly see the device as having a successful -* recovery) +* recovery). +* We have to be careful to count a medium access failure only once +* per device and SCSI EH run; there might be several timed out +* commands which will cause the 'max_medium_access_timeouts' counter +* to trigger after the first SCSI EH run already and set the device +* to offline. **/ -static int sd_eh_action (struct scsi_cmnd *scmd,int eh_disp) +static int sd_eh_action (struct scsi_cmnd *scmd,int eh_disp,bool restart) {struct scsi_disk *sdkp =scsi_disk (scmd->request->rq_disk); +if (restart) { +/* New SCSI EH run, reset gate variable */ + sdkp->ignore_medium_access_errors = false; +return eh_disp; + } if (!scsi_device_online(scmd->device) || !scsi_medium_access_command(scmd) || host_byte(scmd->result) != DID_TIME_OUT ||
@@ -1714,7 +1725,10 @@ static int sd_eh_action(struct scsi_cmnd *scmd, int eh_disp)* process of recovering or has it suffered an internal failure * that prevents access to the storage medium. */ - sdkp->medium_access_timed_out++; +if (!sdkp->ignore_medium_access_errors) { + sdkp->medium_access_timed_out++; + sdkp->ignore_medium_access_errors = true; + }/* * If the device keeps failing read/write commands but TEST UNIT
drivers/scsi/sd.h +1 -0
@@ -106,6 +106,7 @@ struct scsi_disk { unsigned rc_basis: 2; unsigned zoned: 2; unsigned urswrz : 1; + unsigned ignore_medium_access_errors : 1; };#define to_scsi_disk (obj) container_of(obj,struct scsi_disk,dev)
include/scsi/scsi_driver.h +1 -1
@@ -15,7 +15,7 @@ struct scsi_driver {int (*init_command)(struct scsi_cmnd *);void (*uninit_command)(struct scsi_cmnd *);int (*done)(struct scsi_cmnd *); -int (*eh_action)(struct scsi_cmnd *,int ); +int (*eh_action)(struct scsi_cmnd *,int ,bool ); };#define to_scsi_driver (drv) \ container_of((drv), struct scsi_driver, gendrv)
Signature · 1 line
1.8.5.6
Re: [PATCHv4 1/8] scsi_error: count medium access timeout only once per EH run
NAK - don't overload ->eh_action for two entirely different purposes.
PATCH v4 2/8 sd: Return SUCCESS in sd_eh_action() after device offline
In reply to Hannes ReineckeIf sd_eh_action() decides to take the device offline there is no point in returning FAILED, as taking the device offline is the ultimate step in SCSI EH anyway.
So further escalation via SCSI EH is not likely to make a difference and we can as well return SUCCESS.
Cc Benjamin Block <[email protected]>
Signed-off-by Hannes Reinecke <[email protected]>
--- drivers/scsi/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/sd.c +1 -1
@@ -1740,7 +1740,7 @@ static int sd_eh_action(struct scsi_cmnd *scmd, int eh_disp, bool restart) "Medium access timeout failure. Offlining disk!\n");scsi_device_set_state (scmd->device,SDEV_OFFLINE ); -return FAILED ; +return SUCCESS ; }return eh_disp;
Signature · 1 line
1.8.5.6
PATCH v4 3/8 scsi: always send command aborts
In reply to Hannes ReineckeWhen a command has timed out we always should be sending an abort; with the previous code a failed abort might signal SCSI EH to start, and all other timed out commands will never be aborted, even though they might belong to a different ITL nexus.
Cc Benjamin Block <[email protected]>
Signed-off-by Hannes Reinecke <[email protected]>
--- drivers/scsi/scsi_error.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/scsi/scsi_error.c +0 -12
@@ -196,19 +196,7 @@ static int scsi_host_eh_past_deadline(struct Scsi_Host *shost)return FAILED ; } -/* -* Do not try a command abort if -* SCSI EH has already started. -*/ spin_lock_irqsave (shost->host_lock, flags); -if (scsi_host_in_recovery (shost)) { -spin_unlock_irqrestore (shost->host_lock, flags); -SCSI_LOG_ERROR_RECOVERY (3 , -scmd_printk (KERN_INFO , scmd, -"not aborting, host in recovery\n" )); -return FAILED ; - } -if (shost->eh_deadline !=-1 && !shost->last_reset) shost->last_reset = jiffies;spin_unlock_irqrestore (shost->host_lock, flags);
Signature · 1 line
1.8.5.6
PATCH v4 4/8 libsas: allow async aborts
In reply to Hannes ReineckeFrom: Christoph Hellwig <[email protected]>
We now first try to call ->eh_abort_handler from a work queue, but libsas was always failing that for no good reason. Allow async aborts.
Reviewed-by Johannes Thumshirn <[email protected]>
Reviewed-by Hannes Reinecke <[email protected]>
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/scsi/libsas/sas_scsi_host.c | 3 --- 1 file changed, 3 deletions(-)
drivers/scsi/libsas/sas_scsi_host.c +0 -3
@@ -491,9 +491,6 @@ int sas_eh_abort_handler(struct scsi_cmnd *cmd)struct Scsi_Host *host = cmd->device->host;struct sas_internal *i =to_sas_internal (host->transportt); -if (current != host->ehandler) -return FAILED ; -if (!i->dft->lldd_abort_task)return FAILED ;
Signature · 1 line
1.8.5.6
PATCH v4 5/8 scsi: make eh_eflags persistent
In reply to Hannes ReineckeIf a failed command is retried and fails again we need to enter SCSI EH, otherwise we will never be able to recover the command.
To detect this situation we must not clear scmd->eh_eflags when EH finishes but rather make it persistent throughout the lifetime of the command.
Reviewed-by Benjamin Block <[email protected]>
Reviewed-by Bart Van Assche <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
Signed-off-by Hannes Reinecke <[email protected]>
--- Documentation/scsi/scsi_eh.txt | 14 +++++++------- drivers/scsi/libsas/sas_scsi_host.c | 2 -- drivers/scsi/scsi_error.c | 4 ++-- include/scsi/scsi_eh.h | 1 + 4 files changed, 10 insertions(+), 11 deletions(-)
Documentation/scsi/scsi_eh.txt +7 -7
@@ -105,11 +105,14 @@ function 2. If the host supports asynchronous completion (as indicated by the no_async_abort setting in the host template) scsi_abort_command() - is invoked to schedule an asynchrous abort. If that fails - Step #3 is taken. + is invoked to schedule an asynchrous abort. + Asynchronous abort are not invoked for commands which the + SCSI_EH_ABORT_SCHEDULED flag is set (this indicates that the command + already had been aborted once, and this is a retry which failed), + or when the EH deadline is expired. In these case Step #3 is taken. - 2. scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD) is invoked for the - command. See [1-3] for more information. + 3. scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD) is invoked for the + command. See [1-4] for more information. [1-3] Asynchronous command aborts
@@ -263,7 +266,6 @@ scmd->allowed. 3. scmd recovered ACTION: scsi_eh_finish_cmd() is invoked to EH-finish scmd - - clear scmd->eh_eflags - scsi_setup_cmd_retry() - move from local eh_work_q to local eh_done_q LOCKING: none
@@ -456,8 +458,6 @@ except for #1 must be implemented by eh_strategy_handler(). - shost->host_failed is zero. - - Each scmd's eh_eflags field is cleared. - - Each scmd is in such a state that scsi_setup_cmd_retry() on the scmd doesn't make any difference.
drivers/scsi/libsas/sas_scsi_host.c +0 -2
@@ -613,8 +613,6 @@ static void sas_eh_handle_sas_errors(struct Scsi_Host *shost, struct list_head *SAS_DPRINTK ("trying to find task 0x%p\n" , task); res =sas_scsi_find_task (task); - cmd->eh_eflags =0 ; -switch (res) {case TASK_IS_DONE : SAS_DPRINTK("%s: task 0x%p is done\n", __func__,
drivers/scsi/scsi_error.c +2 -2
@@ -188,7 +188,6 @@ static int scsi_host_eh_past_deadline(struct Scsi_Host *shost)/* * Retry after abort failed, escalate to next level. */ - scmd->eh_eflags &= ~SCSI_EH_ABORT_SCHEDULED ;SCSI_LOG_ERROR_RECOVERY (3 ,scmd_printk (KERN_INFO , scmd,"previous abort failed\n" ));
@@ -940,6 +939,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, ses->result = scmd->result; ses->underflow = scmd->underflow; ses->prot_op = scmd->prot_op; + ses->eh_eflags = scmd->eh_eflags; scmd->prot_op =SCSI_PROT_NORMAL ; scmd->eh_eflags =0 ;
@@ -1003,6 +1003,7 @@ void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd, struct scsi_eh_save *ses) scmd->result = ses->result; scmd->underflow = ses->underflow; scmd->prot_op = ses->prot_op; + scmd->eh_eflags = ses->eh_eflags; }EXPORT_SYMBOL (scsi_eh_restore_cmnd);
@@ -1135,7 +1136,6 @@ static int scsi_eh_action(struct scsi_cmnd *scmd, int rtn)*/ void scsi_eh_finish_cmd (struct scsi_cmnd *scmd,struct list_head *done_q) { - scmd->eh_eflags =0 ;list_move_tail (&scmd->eh_entry, done_q); }EXPORT_SYMBOL (scsi_eh_finish_cmd);
include/scsi/scsi_eh.h +1 -0
@@ -31,6 +31,7 @@ extern int scsi_get_sense_info_fld(const u8 * sense_buffer, int sb_len,struct scsi_eh_save {/* saved state */ int result; +int eh_eflags;enum dma_data_direction data_direction;unsigned underflow;unsigned char cmd_len;
Signature · 1 line
1.8.5.6
PATCH v4 6/8 scsi: make scsi_eh_scmd_add() always succeed
In reply to Hannes Reineckescsi_eh_scmd_add() currently only will fail if no error handler thread is started (which will never be the case) or if the state machine encounters an illegal transition.
But if we're encountering an invalid state transition chances is we cannot fixup things with the error handler. So better add a WARN_ON for illegal host states and make scsi_dh_scmd_add() a void function.
Signed-off-by Hannes Reinecke <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
Reviewed-by Bart Van Assche <[email protected]>
--- drivers/scsi/scsi_error.c | 41 +++++++++++++---------------------------- drivers/scsi/scsi_lib.c | 4 ++-- drivers/scsi/scsi_priv.h | 2 +- 3 files changed, 16 insertions(+), 31 deletions(-)
drivers/scsi/scsi_error.c +13 -28
@@ -162,13 +162,7 @@ static int scsi_host_eh_past_deadline(struct Scsi_Host *shost) } } -if (!scsi_eh_scmd_add (scmd,0 )) { -SCSI_LOG_ERROR_RECOVERY (3 , -scmd_printk (KERN_WARNING , scmd, -"terminate aborted command\n" )); -set_host_byte (scmd,DID_TIME_OUT ); -scsi_finish_command (scmd); - } +scsi_eh_scmd_add (scmd,0 ); }/**
@@ -231,28 +225,23 @@ static int scsi_eh_reset(struct scsi_cmnd *scmd)* scsi_eh_scmd_add - add scsi cmd to error handling. * @scmd: scmd to run eh on. * @eh_flag: optional SCSI_EH flag. -* -* Return value: -* 0 on failure. */ -int scsi_eh_scmd_add (struct scsi_cmnd *scmd,int eh_flag) +void scsi_eh_scmd_add (struct scsi_cmnd *scmd,int eh_flag) {struct Scsi_Host *shost = scmd->device->host;unsigned long flags; -int ret =0 ; +int ret; -if (!shost->ehandler) -return 0 ; +WARN_ON_ONCE (!shost->ehandler);spin_lock_irqsave (shost->host_lock, flags); -if (scsi_host_set_state (shost,SHOST_RECOVERY )) -if (scsi_host_set_state (shost,SHOST_CANCEL_RECOVERY )) - goto out_unlock; - +if (scsi_host_set_state (shost,SHOST_RECOVERY )) { + ret =scsi_host_set_state (shost,SHOST_CANCEL_RECOVERY ); +WARN_ON_ONCE (ret); + }if (shost->eh_deadline !=-1 && !shost->last_reset) shost->last_reset = jiffies; - ret =1 ;if (scmd->eh_eflags &SCSI_EH_ABORT_SCHEDULED ) eh_flag &= ~SCSI_EH_CANCEL_CMD ; scmd->eh_eflags |= eh_flag;
@@ -260,9 +249,7 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag)list_add_tail (&scmd->eh_entry, &shost->eh_cmd_q); shost->host_failed++;scsi_eh_wakeup (shost); - out_unlock:spin_unlock_irqrestore (shost->host_lock, flags); -return ret; }/**
@@ -291,13 +278,11 @@ enum blk_eh_timer_return scsi_times_out(struct request *req) rtn = host->hostt->eh_timed_out (scmd);if (rtn ==BLK_EH_NOT_HANDLED ) { -if (!host->hostt->no_async_abort && -scsi_abort_command (scmd) ==SUCCESS ) -return BLK_EH_NOT_HANDLED ; - -set_host_byte (scmd,DID_TIME_OUT ); -if (!scsi_eh_scmd_add (scmd,SCSI_EH_CANCEL_CMD )) - rtn =BLK_EH_HANDLED ; +if (host->hostt->no_async_abort || +scsi_abort_command (scmd) !=SUCCESS ) { +set_host_byte (scmd,DID_TIME_OUT ); +scsi_eh_scmd_add (scmd,SCSI_EH_CANCEL_CMD ); + } }return rtn;
drivers/scsi/scsi_lib.c +2 -2
@@ -1593,8 +1593,8 @@ static void scsi_softirq_done(struct request *rq)scsi_queue_insert (cmd,SCSI_MLQUEUE_DEVICE_BUSY );break ;default : -if (!scsi_eh_scmd_add (cmd,0 )) -scsi_finish_command (cmd); +scsi_eh_scmd_add (cmd,0 ); +break ; } }
drivers/scsi/scsi_priv.h +1 -1
@@ -72,7 +72,7 @@ extern int scsi_dev_info_list_add_keyed(int compatible, char *vendor,extern int scsi_error_handler (void *host);extern int scsi_decide_disposition (struct scsi_cmnd *cmd);extern void scsi_eh_wakeup (struct Scsi_Host *shost); -extern int scsi_eh_scmd_add (struct scsi_cmnd *,int ); +extern void scsi_eh_scmd_add (struct scsi_cmnd *,int );void scsi_eh_ready_devs (struct Scsi_Host *shost,struct list_head *work_q,struct list_head *done_q);
Signature · 1 line
1.8.5.6
PATCH v4 7/8 scsi: make asynchronous aborts mandatory
In reply to Hannes ReineckeThere hasn't been any reports for HBAs where asynchronous abort would not work, so we should make it mandatory and remove the fallback.
Signed-off-by Hannes Reinecke <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
Reviewed-by Bart Van Assche <[email protected]>
--- Documentation/scsi/scsi_eh.txt | 18 ++++------ drivers/scsi/scsi_error.c | 81 ++++-------------------------------------- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_priv.h | 3 +- include/scsi/scsi_host.h | 5 --- 5 files changed, 15 insertions(+), 94 deletions(-)
Documentation/scsi/scsi_eh.txt +6 -12
@@ -70,7 +70,7 @@ with the command. scmd is requeued to blk queue. - otherwise - scsi_eh_scmd_add(scmd, 0) is invoked for the command. See + scsi_eh_scmd_add(scmd) is invoked for the command. See [1-3] for details of this function.
@@ -103,9 +103,7 @@ function eh_timed_out() callback did not handle the command. Step #2 is taken. - 2. If the host supports asynchronous completion (as indicated by the - no_async_abort setting in the host template) scsi_abort_command() - is invoked to schedule an asynchrous abort. + 2. scsi_abort_command() is invoked to schedule an asynchrous abort. Asynchronous abort are not invoked for commands which the SCSI_EH_ABORT_SCHEDULED flag is set (this indicates that the command already had been aborted once, and this is a retry which failed),
@@ -127,16 +125,13 @@ function scmds enter EH via scsi_eh_scmd_add(), which does the following. - 1. Turns on scmd->eh_eflags as requested. It's 0 for error - completions and SCSI_EH_CANCEL_CMD for timeouts. + 1. Links scmd->eh_entry to shost->eh_cmd_q - 2. Links scmd->eh_entry to shost->eh_cmd_q + 2. Sets SHOST_RECOVERY bit in shost->shost_state - 3. Sets SHOST_RECOVERY bit in shost->shost_state + 3. Increments shost->host_failed - 4. Increments shost->host_failed - - 5. Wakes up SCSI EH thread if shost->host_busy == shost->host_failed + 4. Wakes up SCSI EH thread if shost->host_busy == shost->host_failed As can be seen above, once any scmd is added to shost->eh_cmd_q, SHOST_RECOVERY shost_state bit is turned on. This prevents any new
@@ -252,7 +247,6 @@ scmd->allowed. 1. Error completion / time out ACTION: scsi_eh_scmd_add() is invoked for scmd - - set scmd->eh_eflags - add scmd to shost->eh_cmd_q - set SHOST_RECOVERY - shost->host_failed++
drivers/scsi/scsi_error.c +7 -74
137 lines not on this page · raw message
drivers/scsi/scsi_lib.c +1 -1
@@ -1593,7 +1593,7 @@ static void scsi_softirq_done(struct request *rq)scsi_queue_insert (cmd,SCSI_MLQUEUE_DEVICE_BUSY );break ;default : -scsi_eh_scmd_add (cmd,0 ); +scsi_eh_scmd_add (cmd);break ; } }
drivers/scsi/scsi_priv.h +1 -2
@@ -18,7 +18,6 @@/* * Scsi Error Handler Flags */ -#define SCSI_EH_CANCEL_CMD 0x0001/* Cancel this cmd */ #define SCSI_EH_ABORT_SCHEDULED 0x0002/* Abort has been scheduled */ #define SCSI_SENSE_VALID (scmd) \
@@ -72,7 +71,7 @@ extern int scsi_dev_info_list_add_keyed(int compatible, char *vendor,extern int scsi_error_handler (void *host);extern int scsi_decide_disposition (struct scsi_cmnd *cmd);extern void scsi_eh_wakeup (struct Scsi_Host *shost); -extern void scsi_eh_scmd_add (struct scsi_cmnd *,int ); +extern void scsi_eh_scmd_add (struct scsi_cmnd *);void scsi_eh_ready_devs (struct Scsi_Host *shost,struct list_head *work_q,struct list_head *done_q);
include/scsi/scsi_host.h +0 -5
@@ -452,11 +452,6 @@ struct scsi_host_template { unsigned no_write_same:1;/* -* True if asynchronous aborts are not supported -*/ - unsigned no_async_abort:1; - -/* * Countdown for host blocking with no commands outstanding. */ unsigned int max_host_blocked;
Signature · 1 line
1.8.5.6
PATCH v4 8/8 scsi: inline command aborts
In reply to Hannes ReineckeThe block layer always calls the timeout function from a workqueue context, so there is no need to have yet another workqueue for running command aborts.
Signed-off-by Hannes Reinecke <[email protected]>
--- drivers/scsi/scsi.c | 2 -- drivers/scsi/scsi_error.c | 80 +++++++++++++++++++++++------------------------ drivers/scsi/scsi_lib.c | 2 -- drivers/scsi/scsi_priv.h | 1 - 4 files changed, 39 insertions(+), 46 deletions(-)
drivers/scsi/scsi.c +0 -2
@@ -115,8 +115,6 @@ void scsi_put_command(struct scsi_cmnd *cmd)BUG_ON (list_empty (&cmd->list));list_del_init (&cmd->list);spin_unlock_irqrestore (&cmd->device->list_lock, flags); - -BUG_ON (delayed_work_pending (&cmd->abort_work)); }#ifdef CONFIG_SCSI_LOGGING
drivers/scsi/scsi_error.c +39 -41
117 lines not on this page · raw message
drivers/scsi/scsi_lib.c +0 -2
@@ -1146,7 +1146,6 @@ void scsi_init_command(struct scsi_device *dev, struct scsi_cmnd *cmd) cmd->device = dev; cmd->sense_buffer = buf; cmd->prot_sdb = prot; -INIT_DELAYED_WORK (&cmd->abort_work, scmd_eh_abort_handler); cmd->jiffies_at_alloc = jiffies;spin_lock_irqsave (&dev->list_lock, flags);
@@ -1863,7 +1862,6 @@ static int scsi_mq_prep_fn(struct request *req) cmd->prot_op =SCSI_PROT_NORMAL ;INIT_LIST_HEAD (&cmd->list); -INIT_DELAYED_WORK (&cmd->abort_work, scmd_eh_abort_handler); cmd->jiffies_at_alloc = jiffies;if (shost->use_cmd_list) {
drivers/scsi/scsi_priv.h +0 -1
@@ -66,7 +66,6 @@ extern int scsi_dev_info_list_add_keyed(int compatible, char *vendor,extern void scsi_exit_devinfo (void );/* scsi_error.c */ -extern void scmd_eh_abort_handler (struct work_struct *work);extern enum blk_eh_timer_return scsi_times_out (struct request *req);extern int scsi_error_handler (void *host);extern int scsi_decide_disposition (struct scsi_cmnd *cmd);
Signature · 1 line
1.8.5.6
kbuild test robot
build botRe: [PATCHv4 8/8] scsi: inline command aborts
All warnings (new ones prefixed by >>):
Hi Hannes,
[auto build test WARNING on scsi/for-next]
[also build test WARNING on v4.11-rc5 next-20170404]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Hannes-Reinecke/scsi_error-count-medium-access-timeout-only-once-per-EH-run/20170405-060357 base: https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git for-next reproduce: make htmldocs
All warnings (new ones prefixed by >>):
>> drivers/scsi/scsi_error.c:120: warning: No description found for parameter 'scmd' >> drivers/scsi/scsi_error.c:120: warning: Excess function parameter 'work' description in 'scmd_eh_abort_handler'
drivers/scsi/constants.c:1: warning: no structured comments found
vim +/scmd +120 drivers/scsi/scsi_error.c
bb3b621a Ren Mingxin 2013-11-11 104 * if eh_deadline has been set to 'off' during the
76ad3e59 Hannes Reinecke 2013-11-11 105 * time_before call.
76ad3e59 Hannes Reinecke 2013-11-11 106 */
76ad3e59 Hannes Reinecke 2013-11-11 107 if (time_before(jiffies, shost->last_reset + shost->eh_deadline) &&
bb3b621a Ren Mingxin 2013-11-11 108 shost->eh_deadline > -1)
b4562022 Hannes Reinecke 2013-10-23 109 return 0;
b4562022 Hannes Reinecke 2013-10-23 110
b4562022 Hannes Reinecke 2013-10-23 111 return 1;
b4562022 Hannes Reinecke 2013-10-23 112 }
b4562022 Hannes Reinecke 2013-10-23 113
^1da177e Linus Torvalds 2005-04-16 114 /**
e494f6a7 Hannes Reinecke 2013-11-11 115 * scmd_eh_abort_handler - Handle command aborts
e494f6a7 Hannes Reinecke 2013-11-11 116 * @work: command to be aborted.
e494f6a7 Hannes Reinecke 2013-11-11 117 */
07311267 Hannes Reinecke 2017-04-04 118 int
07311267 Hannes Reinecke 2017-04-04 119 scmd_eh_abort_handler(struct scsi_cmnd *scmd)
e494f6a7 Hannes Reinecke 2013-11-11 @120 {
e494f6a7 Hannes Reinecke 2013-11-11 121 struct scsi_device *sdev = scmd->device;
e494f6a7 Hannes Reinecke 2013-11-11 122 int rtn;
e494f6a7 Hannes Reinecke 2013-11-11 123
e494f6a7 Hannes Reinecke 2013-11-11 124 if (scsi_host_eh_past_deadline(sdev->host)) {
e494f6a7 Hannes Reinecke 2013-11-11 125 SCSI_LOG_ERROR_RECOVERY(3,
e494f6a7 Hannes Reinecke 2013-11-11 126 scmd_printk(KERN_INFO, scmd,
470613b4 Hannes Reinecke 2015-01-08 127 "eh timeout, not aborting\n"));
07311267 Hannes Reinecke 2017-04-04 128 return FAILED;:::::: The code at line 120 was first introduced by commit
:::::: e494f6a728394ab0df194342549ee20e6f0752df [SCSI] improved eh timeout handler
:::::: TO: Hannes Reinecke <[email protected]> :::::: CC: James Bottomley <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation