UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: hisi_sas: Run I_T nexus resets in parallel for clear nexus reset 

For a clear nexus reset operation, the I_T nexus resets are executed
serially for each device. For devices attached through an expander, this
may take 2s per device; so, in total, could take a long time.

Reduce the total time by running the I_T nexus resets in parallel through
async operations.

Link: https://lore.kernel.org/r/1623058179-80434-3-git-send-email-john.garry@huawei.com
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: chenyi <chenyi211@huawei.com>
This commit is contained in:
Luo Jiaxing 2021-06-07 17:29:36 +08:00 committed by Jianping Liu
parent dcbccb8b56
commit b3dcc0c786
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/hisi_sas/hisi_sas.h
View File

@ -8,6 +8,9 @@
#define _HISI_SAS_H_ #define _HISI_SAS_H_
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/async.h>
#include <linux/blk-mq.h>
#include <linux/blk-mq-pci.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/dmapool.h> #include <linux/dmapool.h>

23
drivers/scsi/hisi_sas/hisi_sas_main.c
View File

@ -2016,12 +2016,24 @@ out:
return rc; return rc;
} }
static void hisi_sas_async_I_T_nexus_reset(void *data, async_cookie_t cookie)
{
struct domain_device *device = data;
struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
int rc;
rc = hisi_sas_debug_I_T_nexus_reset(device);
if (rc != TMF_RESP_FUNC_COMPLETE)
dev_info(hisi_hba->dev, "I_T_nexus reset fail for dev:%016llx rc=%d\n",
SAS_ADDR(device->sas_addr), rc);
}
static int hisi_sas_clear_nexus_ha(struct sas_ha_struct *sas_ha) static int hisi_sas_clear_nexus_ha(struct sas_ha_struct *sas_ha)
{ {
struct hisi_hba *hisi_hba = sas_ha->lldd_ha; struct hisi_hba *hisi_hba = sas_ha->lldd_ha;
struct device *dev = hisi_hba->dev;
HISI_SAS_DECLARE_RST_WORK_ON_STACK(r); HISI_SAS_DECLARE_RST_WORK_ON_STACK(r);
int rc, i; ASYNC_DOMAIN_EXCLUSIVE(async);
int i;
queue_work(hisi_hba->wq, &r.work); queue_work(hisi_hba->wq, &r.work);
wait_for_completion(r.completion); wait_for_completion(r.completion);
@ -2036,12 +2048,11 @@ static int hisi_sas_clear_nexus_ha(struct sas_ha_struct *sas_ha)
dev_is_expander(device->dev_type)) dev_is_expander(device->dev_type))
continue; continue;
rc = hisi_sas_debug_I_T_nexus_reset(device); async_schedule_domain(hisi_sas_async_I_T_nexus_reset,
if (rc != TMF_RESP_FUNC_COMPLETE) device, &async);
dev_info(dev, "clear nexus ha: for device[%d] rc=%d\n",
sas_dev->device_id, rc);
} }
async_synchronize_full_domain(&async);
hisi_sas_release_tasks(hisi_hba); hisi_sas_release_tasks(hisi_hba);
return TMF_RESP_FUNC_COMPLETE; return TMF_RESP_FUNC_COMPLETE;