Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: ufshcd: Fix device links when BOOT WLUN fails to probe

Managed device links are deleted by device_del(). However it is possible to
add a device link to a consumer before device_add(), and then discovering
an error prevents the device from being used. In that case normally
references to the device would be dropped and the device would be deleted.
However the device link holds a reference to the device, so the device link
and device remain indefinitely (unless the supplier is deleted).

For UFSHCD, if a LUN fails to probe (e.g. absent BOOT WLUN), the device
will not have been registered but can still have a device link holding a
reference to the device. The unwanted device link will prevent runtime
suspend indefinitely.

Amend device link removal to accept removal of a link with an unregistered
consumer device (suggested by Rafael), and fix UFSHCD by explicitly
deleting the device link when SCSI destroys the SCSI device.

Link: https://lore.kernel.org/r/a1c9bac8-b560-b662-f0aa-58c7e000cbbd@intel.com
Fixes: b294ff3e3449 ("scsi: ufs: core: Enable power management for wlun")
Reviewed-by: Rafael J. Wysocki <rafael@kernel.org>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Adrian Hunter and committed by
Martin K. Petersen
bf25967a a5402cdc

+23 -2
+2
drivers/base/core.c
··· 884 884 { 885 885 if (link->flags & DL_FLAG_STATELESS) 886 886 kref_put(&link->kref, __device_link_del); 887 + else if (!device_is_registered(link->consumer)) 888 + __device_link_del(&link->kref); 887 889 else 888 890 WARN(1, "Unable to drop a managed device link reference\n"); 889 891 }
+21 -2
drivers/scsi/ufs/ufshcd.c
··· 5028 5028 static void ufshcd_slave_destroy(struct scsi_device *sdev) 5029 5029 { 5030 5030 struct ufs_hba *hba; 5031 + unsigned long flags; 5031 5032 5032 5033 hba = shost_priv(sdev->host); 5033 5034 ··· 5036 5035 5037 5036 /* Drop the reference as it won't be needed anymore */ 5038 5037 if (ufshcd_scsi_to_upiu_lun(sdev->lun) == UFS_UPIU_UFS_DEVICE_WLUN) { 5039 - unsigned long flags; 5040 - 5041 5038 spin_lock_irqsave(hba->host->host_lock, flags); 5042 5039 hba->sdev_ufs_device = NULL; 5043 5040 spin_unlock_irqrestore(hba->host->host_lock, flags); 5041 + } else if (hba->sdev_ufs_device) { 5042 + struct device *supplier = NULL; 5043 + 5044 + /* Ensure UFS Device WLUN exists and does not disappear */ 5045 + spin_lock_irqsave(hba->host->host_lock, flags); 5046 + if (hba->sdev_ufs_device) { 5047 + supplier = &hba->sdev_ufs_device->sdev_gendev; 5048 + get_device(supplier); 5049 + } 5050 + spin_unlock_irqrestore(hba->host->host_lock, flags); 5051 + 5052 + if (supplier) { 5053 + /* 5054 + * If a LUN fails to probe (e.g. absent BOOT WLUN), the 5055 + * device will not have been registered but can still 5056 + * have a device link holding a reference to the device. 5057 + */ 5058 + device_link_remove(&sdev->sdev_gendev, supplier); 5059 + put_device(supplier); 5060 + } 5044 5061 } 5045 5062 } 5046 5063