Re: [PATCH v4 5/9] scsi: Do not wait for a request in scsi_eh_lock_door()

[Bart Van Assche <bvanassche@xxxxxxx>]

On 12/1/20 11:06 PM, Hannes Reinecke wrote:
> On 11/30/20 3:46 AM, Bart Van Assche wrote:
>> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
>> index d94449188270..6de6e1bf3dcb 100644
>> --- a/drivers/scsi/scsi_error.c
>> +++ b/drivers/scsi/scsi_error.c
>> @@ -1993,7 +1993,12 @@ static void scsi_eh_lock_door(struct
>> scsi_device *sdev)
>>       struct request *req;
>>       struct scsi_request *rq;
>>   -    req = blk_get_request(sdev->request_queue, REQ_OP_SCSI_IN, 0);
>> +    /*
>> +     * It is not guaranteed that a request is available nor that
>> +     * sdev->request_queue is unfrozen. Hence the BLK_MQ_REQ_NOWAIT
>> below.
>> +     */
>> +    req = blk_get_request(sdev->request_queue, REQ_OP_SCSI_IN,
>> +                  BLK_MQ_REQ_NOWAIT);
>>       if (IS_ERR(req))
>>           return;
>>       rq = scsi_req(req);
>>
>
> Well ... had been thinking about that one, too.
> The idea of this function is that prior to SCSI EH the device was locked
> via scsi_set_medium_removal(). And during SCSI EH the device might have
> become unlocked, so we need to lock it again.
> However, scsi_set_medium_removal() not only issues the
> PREVENT_ALLOW_MEDIUM_REMOVAL command, but also sets the 'locked' flag
> based on the result.
> So if we fail to get a request here, shouldn't we unset the 'locked'
> flag, too?

Probably not. My interpretation of the 'locked' flag is that it
represents the door state before error handling began. The following
code in the SCSI error handler restores the door state after a bus reset:

	if (scsi_device_online(sdev) && sdev->was_reset && sdev->locked) {
		scsi_eh_lock_door(sdev);
		sdev->was_reset = 0;
	}

> And what does happen if we fail here? There is no return value, hence
> SCSI EH might run to completion, and the system will continue
> with an unlocked door ...
> Not sure if that's a good idea.

How about applying the following patch on top of patch 5/9?

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 6de6e1bf3dcb..feac7262e40e 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1988,7 +1988,7 @@ static void eh_lock_door_done(struct request *req, blk_status_t status)
  * 	We queue up an asynchronous "ALLOW MEDIUM REMOVAL" request on the
  * 	head of the devices request queue, and continue.
  */
-static void scsi_eh_lock_door(struct scsi_device *sdev)
+static int scsi_eh_lock_door(struct scsi_device *sdev)
 {
 	struct request *req;
 	struct scsi_request *rq;
@@ -2000,7 +2000,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev)
 	req = blk_get_request(sdev->request_queue, REQ_OP_SCSI_IN,
 			      BLK_MQ_REQ_NOWAIT);
 	if (IS_ERR(req))
-		return;
+		return PTR_ERR(req);
 	rq = scsi_req(req);

 	rq->cmd[0] = ALLOW_MEDIUM_REMOVAL;
@@ -2016,6 +2016,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev)
 	rq->retries = 5;

 	blk_execute_rq_nowait(req->q, NULL, req, 1, eh_lock_door_done);
+	return 0;
 }

 /**
@@ -2037,8 +2038,8 @@ static void scsi_restart_operations(struct Scsi_Host *shost)
 	 * is no point trying to lock the door of an off-line device.
 	 */
 	shost_for_each_device(sdev, shost) {
-		if (scsi_device_online(sdev) && sdev->was_reset && sdev->locked) {
-			scsi_eh_lock_door(sdev);
+		if (scsi_device_online(sdev) && sdev->was_reset &&
+		    sdev->locked && scsi_eh_lock_door(sdev) == 0) {
 			sdev->was_reset = 0;
 		}
 	}

Thanks,

Bart.