| Message ID | 20210809094929.3987-1-mwilck@suse.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ibmvfc: do not wait for initial device scan | expand |
Martin, > From: Hannes Reinecke <hare@suse.de> > > The initial device scan might take some time, and there really is > no need to wait for it during probe(). > So return immediately from scsi_scan_host() during probe() and avoid > any udev stalls during booting. > > Signed-off-by: Hannes Reinecke <hare@suse.com> I'll let Tyrel review the functional changes. However, your submission needs a Signed-off-by: tag.
On 8/9/21 2:49 AM, mwilck@suse.com wrote: > From: Hannes Reinecke <hare@suse.de> > > The initial device scan might take some time, and there really is > no need to wait for it during probe(). > So return immediately from scsi_scan_host() during probe() and avoid > any udev stalls during booting. > > Signed-off-by: Hannes Reinecke <hare@suse.com> Pending a SOB from Martin... Acked-by: Tyrel Datwyler <tyreld@linux.ibm.com>
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index 935b01ee44b7..9d6550488db1 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -3292,14 +3292,18 @@ static int ibmvfc_scan_finished(struct Scsi_Host *shost, unsigned long time) int done = 0; spin_lock_irqsave(shost->host_lock, flags); - if (time >= (init_timeout * HZ)) { + if (!vhost->scan_timeout) + done = 1; + else if (time >= (vhost->scan_timeout * HZ)) { dev_info(vhost->dev, "Scan taking longer than %d seconds, " - "continuing initialization\n", init_timeout); + "continuing initialization\n", vhost->scan_timeout); done = 1; } - if (vhost->scan_complete) + if (vhost->scan_complete) { + vhost->scan_timeout = init_timeout; done = 1; + } spin_unlock_irqrestore(shost->host_lock, flags); return done; } @@ -6084,6 +6088,7 @@ static int ibmvfc_probe(struct vio_dev *vdev, const struct vio_device_id *id) vhost->client_scsi_channels = min(shost->nr_hw_queues, nr_scsi_channels); vhost->using_channels = 0; vhost->do_enquiry = 1; + vhost->scan_timeout = 0; strcpy(vhost->partition_name, "UNKNOWN"); init_waitqueue_head(&vhost->work_wait_q); diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h index 92fb889d7eb0..3718406e0988 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.h +++ b/drivers/scsi/ibmvscsi/ibmvfc.h @@ -876,6 +876,7 @@ struct ibmvfc_host { int reinit; int delay_init; int scan_complete; + int scan_timeout; int logged_in; int mq_enabled; int using_channels;