| From e97204ba23552aa807ee14ecad2c29fd57bc2ce8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 1 Apr 2021 11:11:05 +0200 |
| Subject: scsi: scsi_transport_srp: Don't block target in SRP_PORT_LOST state |
| |
| From: Martin Wilck <mwilck@suse.com> |
| |
| [ Upstream commit 5cd0f6f57639c5afbb36100c69281fee82c95ee7 ] |
| |
| rport_dev_loss_timedout() sets the rport state to SRP_PORT_LOST and the |
| SCSI target state to SDEV_TRANSPORT_OFFLINE. If this races with |
| srp_reconnect_work(), a warning is printed: |
| |
| Mar 27 18:48:07 ictm1604s01h4 kernel: dev_loss_tmo expired for SRP port-18:1 / host18. |
| Mar 27 18:48:07 ictm1604s01h4 kernel: ------------[ cut here ]------------ |
| Mar 27 18:48:07 ictm1604s01h4 kernel: scsi_internal_device_block(18:0:0:100) failed: ret = -22 |
| Mar 27 18:48:07 ictm1604s01h4 kernel: Call Trace: |
| Mar 27 18:48:07 ictm1604s01h4 kernel: ? scsi_target_unblock+0x50/0x50 [scsi_mod] |
| Mar 27 18:48:07 ictm1604s01h4 kernel: starget_for_each_device+0x80/0xb0 [scsi_mod] |
| Mar 27 18:48:07 ictm1604s01h4 kernel: target_block+0x24/0x30 [scsi_mod] |
| Mar 27 18:48:07 ictm1604s01h4 kernel: device_for_each_child+0x57/0x90 |
| Mar 27 18:48:07 ictm1604s01h4 kernel: srp_reconnect_rport+0xe4/0x230 [scsi_transport_srp] |
| Mar 27 18:48:07 ictm1604s01h4 kernel: srp_reconnect_work+0x40/0xc0 [scsi_transport_srp] |
| |
| Avoid this by not trying to block targets for rports in SRP_PORT_LOST |
| state. |
| |
| Link: https://lore.kernel.org/r/20210401091105.8046-1-mwilck@suse.com |
| Reviewed-by: Bart Van Assche <bvanassche@acm.org> |
| Signed-off-by: Martin Wilck <mwilck@suse.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/scsi_transport_srp.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c |
| index 1e939a2a387f..98a34ed10f1a 100644 |
| --- a/drivers/scsi/scsi_transport_srp.c |
| +++ b/drivers/scsi/scsi_transport_srp.c |
| @@ -541,7 +541,7 @@ int srp_reconnect_rport(struct srp_rport *rport) |
| res = mutex_lock_interruptible(&rport->mutex); |
| if (res) |
| goto out; |
| - if (rport->state != SRP_RPORT_FAIL_FAST) |
| + if (rport->state != SRP_RPORT_FAIL_FAST && rport->state != SRP_RPORT_LOST) |
| /* |
| * sdev state must be SDEV_TRANSPORT_OFFLINE, transition |
| * to SDEV_BLOCK is illegal. Calling scsi_target_unblock() |
| -- |
| 2.30.2 |
| |