Re: [PATCHv2 2/2] scsi: set timed out out mq requests to complete
From: Bart Van Assche <hidden>
Date: 2018-07-25 15:52:17
Also in:
linux-nvme
On Mon, 2018-07-23 at 08:37 -0600, Keith Busch wrote:
quoted hunk ↗ jump to hunk
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_er=
ror.c
quoted hunk ↗ jump to hunk
index 8932ae81a15a..2715cdaa669c 100644--- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c@@ -296,6 +296,20 @@ enum blk_eh_timer_retur=
n scsi_times_out(struct request *req)
rtn = host->hostt->eh_timed_out(scmd);
=20
if (rtn == BLK_EH_DONE) {
+ /*
+ * For blk-mq, we must set the request state to complete now
+ * before sending the request to the scsi error handler. This
+ * will prevent a use-after-free in the event the LLD manages
+ * to complete the request before the error handler finishes
+ * processing this timed out request.
+ *
+ * If the request was already completed, then the LLD beat th=e
+ * time out handler from transferring the request to the scsi + * error handler. In that case we can return immediately as n=
o
+ * further action is required. + */ + if (req->q->mq_ops && !blk_mq_mark�
AF8-complete(req))
+ return rtn;
if (scsi_abort_command(scmd) != SUCCESS) {
set_host_byte(scmd, DID_TIME_OUT);
scsi_eh_scmd_add(scmd);Hello Keith, What will happen if a completion occurs after scsi_times_out() has = started and before or during the host->hostt->eh_timed_out()? Can that = cause a use-after-free in .eh_timed_out()? Can that cause .eh_timed_out() to retur= n BLK_EH_RESET_TIMER when it should return BLK_EH_DONE? Can that cause blk_mq_rq= _timed_out() to call blk_add_timer() when that function shouldn't be called? Thanks, Bart.