GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

scsi: core: Remove reserved request time-out handling

Browse source 
The SCSI core code does not currently support reserved commands. As such,
requests which time-out would never be reserved, and scsi_timeout()
'reserved' arg should never be set.

Remove handling for reserved requests, drop the wrapper scsi_timeout()
as it now just calls scsi_times_out() always, and finally rename
scsi_times_out() -> scsi_timeout() to match the blk_mq_ops method name.

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/1657109034-206040-2-git-send-email-john.garry@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
John Garry 2022-07-06 20:03:49 +08:00 • committed by Jens Axboe
parent e55cf79814
commit deef1be18e
5 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Documentation/scsi/scsi_eh.rst
View file

@ -87,8 +87,7 @@ with the command.
1.2.2 Completing a scmd w/ timeout 1.2.2 Completing a scmd w/ timeout
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
The timeout handler is scsi_times_out(). When a timeout occurs, this The timeout handler is scsi_timeout(). When a timeout occurs, this function
function
1. invokes optional hostt->eh_timed_out() callback. Return value can 1. invokes optional hostt->eh_timed_out() callback. Return value can
be one of be one of

2
Documentation/scsi/scsi_mid_low_api.rst
View file

@ -731,7 +731,7 @@ Details::
* Notes: If 'no_async_abort' is defined this callback * Notes: If 'no_async_abort' is defined this callback
* will be invoked from scsi_eh thread. No other commands * will be invoked from scsi_eh thread. No other commands
* will then be queued on current host during eh. * will then be queued on current host during eh.
* Otherwise it will be called whenever scsi_times_out() * Otherwise it will be called whenever scsi_timeout()
* is called due to a command timeout. * is called due to a command timeout.
* *
* Optionally defined in: LLD * Optionally defined in: LLD

7
drivers/scsi/scsi_error.c
View file

@ -139,7 +139,7 @@ static bool scsi_eh_should_retry_cmd(struct scsi_cmnd *cmd)
* *
* Note: this function must be called only for a command that has timed out. * Note: this function must be called only for a command that has timed out.
* Because the block layer marks a request as complete before it calls * Because the block layer marks a request as complete before it calls
* scsi_times_out(), a .scsi_done() call from the LLD for a command that has * scsi_timeout(), a .scsi_done() call from the LLD for a command that has
* timed out do not have any effect. Hence it is safe to call * timed out do not have any effect. Hence it is safe to call
* scsi_finish_command() from this function. * scsi_finish_command() from this function.
*/ */
@ -316,8 +316,9 @@ void scsi_eh_scmd_add(struct scsi_cmnd *scmd)
} }
/** /**
* scsi_times_out - Timeout function for normal scsi commands. * scsi_timeout - Timeout function for normal scsi commands.
* @req: request that is timing out. * @req: request that is timing out.
* @reserved: whether the request is a reserved request.
* *
* Notes: * Notes:
* We do not need to lock this. There is the potential for a race * We do not need to lock this. There is the potential for a race
@ -325,7 +326,7 @@ void scsi_eh_scmd_add(struct scsi_cmnd *scmd)
* normal completion function determines that the timer has already * normal completion function determines that the timer has already
* fired, then it mustn't do anything. * fired, then it mustn't do anything.
*/ */
enum blk_eh_timer_return scsi_times_out(struct request *req) enum blk_eh_timer_return scsi_timeout(struct request *req, bool reserved)
{ {
struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(req); struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(req);
enum blk_eh_timer_return rtn = BLK_EH_DONE; enum blk_eh_timer_return rtn = BLK_EH_DONE;

8
drivers/scsi/scsi_lib.c
View file

@ -1790,14 +1790,6 @@ out_put_budget:
return ret; return ret;
} }
static enum blk_eh_timer_return scsi_timeout(struct request *req,
bool reserved)
{
if (reserved)
return BLK_EH_RESET_TIMER;
return scsi_times_out(req);
}
static int scsi_mq_init_request(struct blk_mq_tag_set *set, struct request *rq, static int scsi_mq_init_request(struct blk_mq_tag_set *set, struct request *rq,
unsigned int hctx_idx, unsigned int numa_node) unsigned int hctx_idx, unsigned int numa_node)
{ {

3
drivers/scsi/scsi_priv.h
View file

@ -72,7 +72,8 @@ extern void scsi_exit_devinfo(void);
/* scsi_error.c */ /* scsi_error.c */
extern void scmd_eh_abort_handler(struct work_struct *work); extern void scmd_eh_abort_handler(struct work_struct *work);
extern enum blk_eh_timer_return scsi_times_out(struct request *req); extern enum blk_eh_timer_return scsi_timeout(struct request *req,
bool reserved);
extern int scsi_error_handler(void *host); extern int scsi_error_handler(void *host);
extern enum scsi_disposition scsi_decide_disposition(struct scsi_cmnd *cmd); extern enum scsi_disposition scsi_decide_disposition(struct scsi_cmnd *cmd);
extern void scsi_eh_wakeup(struct Scsi_Host *shost); extern void scsi_eh_wakeup(struct Scsi_Host *shost);