Commit 5f12ac52 authored by Qi Liu's avatar Qi Liu Committed by ZhouJuan
Browse files

scsi: hisi_sas: Add slave_destroy interface for v3 hw 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7BNF8


CVE: NA

----------------------------------------------------------------------

A WARNING is triggered when executing link reset of remote PHY
and rmmod SAS driver simultaneously. Following is the WARNING log:

WARNING: CPU: 61 PID: 21818 at drivers/base/core.c:1347 __device_links_no_driver+0xb4/0xc0
 Call trace:
  __device_links_no_driver+0xb4/0xc0
  device_links_driver_cleanup+0xb0/0xfc
  __device_release_driver+0x198/0x23c
  device_release_driver+0x38/0x50
  bus_remove_device+0x130/0x140
  device_del+0x184/0x434
  __scsi_remove_device+0x118/0x150
  scsi_remove_target+0x1bc/0x240
  sas_rphy_remove+0x90/0x94
  sas_rphy_delete+0x24/0x3c
  sas_destruct_devices+0x64/0xa0 [libsas]
  sas_revalidate_domain+0xe4/0x150 [libsas]
  process_one_work+0x1e0/0x46c
  worker_thread+0x15c/0x464
  kthread+0x160/0x170
  ret_from_fork+0x10/0x20
 ---[ end trace 71e059eb58f85d4a ]---

During SAS phy up, link->status is set to DL_STATE_AVAILABLE in
device_links_driver_bound, then this setting influences
__device_links_no_driver() before driver rmmod and caused WARNING.

So we add the slave_destroy interface, to make sure link is removed
after flush workque.

Fixes: 16fd4a7c ("scsi: hisi_sas: Add device link between SCSI devices and hisi_hba")
Signed-off-by: default avatarQi Liu <liuqi115@huawei.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarxiabing <xiabing12@h-partners.com>
parent 26bd36ad

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+12 −1
Original line number Diff line number Diff line
@@ -2870,7 +2870,8 @@ static int slave_configure_v3_hw(struct scsi_device *sdev) 
		return 0;



	if (!device_link_add(&sdev->sdev_gendev, dev,

			     DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE)) {

			     DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME |

			     DL_FLAG_RPM_ACTIVE)) {

		if (pm_runtime_enabled(dev)) {

			dev_info(dev, "add device link failed, disable runtime PM for the host\n");

			pm_runtime_disable(dev);
@@ -2880,6 +2881,15 @@ static int slave_configure_v3_hw(struct scsi_device *sdev) 
	return 0;

}



static void slave_destroy_v3_hw(struct scsi_device *sdev)

{

	struct Scsi_Host *shost = dev_to_shost(&sdev->sdev_gendev);

	struct hisi_hba *hisi_hba = shost_priv(shost);

	struct device *dev = hisi_hba->dev;



	device_link_remove(&sdev->sdev_gendev, dev);

}



static struct device_attribute *host_attrs_v3_hw[] = {

	&dev_attr_phy_event_threshold,

	&dev_attr_intr_conv_v3_hw,
@@ -3268,6 +3278,7 @@ static struct scsi_host_template sht_v3_hw = { 
	.eh_device_reset_handler = sas_eh_device_reset_handler,

	.eh_target_reset_handler = sas_eh_target_reset_handler,

	.slave_alloc		= hisi_sas_slave_alloc,

	.slave_destroy		= slave_destroy_v3_hw,

	.target_destroy		= sas_target_destroy,

	.ioctl			= sas_ioctl,

#ifdef CONFIG_COMPAT