Commit deef1be1 authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

scsi: core: Remove reserved request time-out handling 



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: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMartin 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: default avatarJens Axboe <axboe@kernel.dk>
parent e55cf798

Documentation/scsi/scsi_eh.rst

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ with the command. 
1.2.2 Completing a scmd w/ timeout

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^



The timeout handler is scsi_times_out().  When a timeout occurs, this

function

The timeout handler is scsi_timeout().  When a timeout occurs, this function



 1. invokes optional hostt->eh_timed_out() callback.  Return value can

    be one of

Documentation/scsi/scsi_mid_low_api.rst

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ Details:: 
    *      Notes: If 'no_async_abort' is defined this callback

    *  	will be invoked from scsi_eh thread. No other commands

    *	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.

    *

    *      Optionally defined in: LLD

drivers/scsi/scsi_error.c

+4 −3
Original line number Diff line number Diff line
@@ -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.

 * 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

 * 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.

 * @reserved:	whether the request is a reserved request.

 *

 * Notes:

 *     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

 *     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);

	enum blk_eh_timer_return rtn = BLK_EH_DONE;

drivers/scsi/scsi_lib.c

+0 −8
Original line number Diff line number Diff line
@@ -1790,14 +1790,6 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx, 
	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,

				unsigned int hctx_idx, unsigned int numa_node)

{

drivers/scsi/scsi_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ 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 enum blk_eh_timer_return scsi_timeout(struct request *req,

					     bool reserved);

extern int scsi_error_handler(void *host);

extern enum scsi_disposition scsi_decide_disposition(struct scsi_cmnd *cmd);

extern void scsi_eh_wakeup(struct Scsi_Host *shost);