From patchwork Thu Mar 7 09:37:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xingui Yang X-Patchwork-Id: 778780 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80AD383CDB; Thu, 7 Mar 2024 09:39:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.191 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709804353; cv=none; b=AB80Pgy1c92A7wwIDRk92W4Vrjn1q4lpWdMaOTNq//7J9efu0+Qxwa4oym/fhGETLYz63tzKaQAoSxy/BSwdiZFjlBV+hL/14LvBob/JtOegZAPApVT6vfau7Gy8ERLRjGfSBsH43bFBjdbQV2xhfaNcbdH0rQEdKXMczRuitnQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709804353; c=relaxed/simple; bh=zRQKWwo4ws0uBzmnbQDiBb/B4IeY2WAPFa4HgSvKD6o=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DekVFUiMq/SvhbTo7l5Q6/dId0wS0TPV1EjQuNq+RZ18r19QkTZKS0pYp7RkdoNeMhKEzHWFaGap8FS+gw5IqJs8FfKLehETNa0Cm+SBs3unpA28+ef+apXwE4P/5BFeGvomR8aKg/HqD10FYHf72mTp5/IgQ6R51Q3Eizz7ous= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.191 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Tr44g21BHz1FM3R; Thu, 7 Mar 2024 17:38:59 +0800 (CST) Received: from dggpemd100001.china.huawei.com (unknown [7.185.36.94]) by mail.maildlp.com (Postfix) with ESMTPS id 6F442140336; Thu, 7 Mar 2024 17:39:08 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by dggpemd100001.china.huawei.com (7.185.36.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Thu, 7 Mar 2024 17:39:08 +0800 From: Xingui Yang To: , , , , CC: , , , , , Subject: [PATCH v3 1/3] scsi: libsas: Allow smp_execute_task() arguments to be on the stack Date: Thu, 7 Mar 2024 09:37:31 +0000 Message-ID: <20240307093733.41222-2-yangxingui@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240307093733.41222-1-yangxingui@huawei.com> References: <20240307093733.41222-1-yangxingui@huawei.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemd100001.china.huawei.com (7.185.36.94) We need to use alloc_smp_resp() and alloc_smp_req() before call smp_execute_task() as we can't allocate these memories on the stack for calling sg_init_one(). But if we changed smp_execute_task() to memcpy from/to data on the stack, it might make callers simpler. Suggested-by: John Garry Signed-off-by: Xingui Yang --- drivers/scsi/libsas/sas_expander.c | 32 ++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index a2204674b680..1eeb69cba8da 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -120,17 +120,6 @@ static int smp_execute_task_sg(struct domain_device *dev, return res; } -static int smp_execute_task(struct domain_device *dev, void *req, int req_size, - void *resp, int resp_size) -{ - struct scatterlist req_sg; - struct scatterlist resp_sg; - - sg_init_one(&req_sg, req, req_size); - sg_init_one(&resp_sg, resp, resp_size); - return smp_execute_task_sg(dev, &req_sg, &resp_sg); -} - /* ---------- Allocations ---------- */ static inline void *alloc_smp_req(int size) @@ -146,6 +135,27 @@ static inline void *alloc_smp_resp(int size) return kzalloc(size, GFP_KERNEL); } +static int smp_execute_task(struct domain_device *dev, void *req, int req_size, + void *resp, int resp_size) +{ + struct scatterlist req_sg; + struct scatterlist resp_sg; + void *_req = kmemdup(req, req_size, GFP_KERNEL); + void *_resp = alloc_smp_resp(resp_size); + int ret; + + if (!_req || !resp) + return -ENOMEM; + + sg_init_one(&req_sg, _req, req_size); + sg_init_one(&resp_sg, _resp, resp_size); + ret = smp_execute_task_sg(dev, &req_sg, &resp_sg); + memcpy(resp, _resp, resp_size); + kfree(_req); + kfree(_resp); + return ret; +} + static char sas_route_char(struct domain_device *dev, struct ex_phy *phy) { switch (phy->routing_attr) { From patchwork Thu Mar 7 09:37:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xingui Yang X-Patchwork-Id: 779633 Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88C4D83CDD; Thu, 7 Mar 2024 09:39:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.35 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709804354; cv=none; b=Tc9pwqhZiPrT2A0Tjw2yA5kCTFhrHBfaERRHIr6lDKnoeHL+zWnK+OVDDhjMXFEWGRNK9RcXJOke3NhymTmlWsyR0cOc411EIbvrj8auapoi37LQ5k0a2mowp31BBYBlfxnbIwOfMQGwrn38bPwHY5KOAoT2/oX/rGBqx1iO6F0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709804354; c=relaxed/simple; bh=6/g2twa7SZ1wwd/bmFk+LdlNvEtLHm/7fgAKyqC66rw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TwOLvQJrYqB644OxuFh9U78ZkBrsDMnSg3br8/ErPGT+A3/yMEmu8dgpoEh7OGZF/ezUSHlcn79mGxQEt7+OsISIGucFmxObdJj5bbLJ/tlgWnsxV7NQAFiQfDPzByGEO5KDL6b2oqD5jTYbrVwLf5e2ZRi+RjUXbApMMXHvpVk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.35 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4Tr426209Gz1QB5g; Thu, 7 Mar 2024 17:36:46 +0800 (CST) Received: from dggpemd100001.china.huawei.com (unknown [7.185.36.94]) by mail.maildlp.com (Postfix) with ESMTPS id 936AC1402CA; Thu, 7 Mar 2024 17:39:08 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by dggpemd100001.china.huawei.com (7.185.36.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Thu, 7 Mar 2024 17:39:08 +0800 From: Xingui Yang To: , , , , CC: , , , , , Subject: [PATCH v3 2/3] scsi: libsas: Add a helper sas_get_sas_addr_and_dev_type() Date: Thu, 7 Mar 2024 09:37:32 +0000 Message-ID: <20240307093733.41222-3-yangxingui@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240307093733.41222-1-yangxingui@huawei.com> References: <20240307093733.41222-1-yangxingui@huawei.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemd100001.china.huawei.com (7.185.36.94) Add a helper to get attached_sas_addr and device type from disc_resp. Suggested-by: John Garry Signed-off-by: Xingui Yang --- drivers/scsi/libsas/sas_expander.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 1eeb69cba8da..d6147616339f 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -1631,6 +1631,16 @@ int sas_discover_root_expander(struct domain_device *dev) /* ---------- Domain revalidation ---------- */ +static void sas_get_sas_addr_and_dev_type(struct smp_disc_resp *disc_resp, + u8 *sas_addr, + enum sas_device_type *type) +{ + memcpy(sas_addr, disc_resp->disc.attached_sas_addr, SAS_ADDR_SIZE); + *type = to_dev_type(&disc_resp->disc); + if (*type == SAS_PHY_UNUSED) + memset(sas_addr, 0, SAS_ADDR_SIZE); +} + static int sas_get_phy_discover(struct domain_device *dev, int phy_id, struct smp_disc_resp *disc_resp) { @@ -1684,13 +1694,8 @@ int sas_get_phy_attached_dev(struct domain_device *dev, int phy_id, return -ENOMEM; res = sas_get_phy_discover(dev, phy_id, disc_resp); - if (res == 0) { - memcpy(sas_addr, disc_resp->disc.attached_sas_addr, - SAS_ADDR_SIZE); - *type = to_dev_type(&disc_resp->disc); - if (*type == 0) - memset(sas_addr, 0, SAS_ADDR_SIZE); - } + if (res == 0) + sas_get_sas_addr_and_dev_type(disc_resp, sas_addr, type); kfree(disc_resp); return res; } From patchwork Thu Mar 7 09:37:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xingui Yang X-Patchwork-Id: 778779 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77C8F83CD9; Thu, 7 Mar 2024 09:39:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709804354; cv=none; b=bxAuK/vx/nD6lGgMuFYxzndtru8cSGDIJzKhRu7dmkMhIPC10C64y6VPZ4SuIcHCHz6YJ/Ps5BkdfIrBufM14kJm2UfqU7NaaYJmqzc6zTQVUXTOT12N4h3+0Orf3l5LLi0hI9HRTDXNIDA9A3oieRo0VypviF75kZ4SA5mwgSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709804354; c=relaxed/simple; bh=OhM4Sor2toqARdjkuEEimm61QVEtpHYHijwkBUJWMjA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kg4dYcU1WS0wUi2Wl/FagDxGq7lvh+C8Bw5wIRu4BuLLLtLRZZ4U1nAAxhlEwYUBQ1qio/RLgVXGQZn/hT4ngCvwMM4qPz2oiPiQ9baq5W8Thwf/kQMXicbTvCg5NvxczDfZ9VkX0N8lyuM/PpsecwAFvbDEttK6Rym3Rm1ELW0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Tr4416YNrzbccx; Thu, 7 Mar 2024 17:38:25 +0800 (CST) Received: from dggpemd100001.china.huawei.com (unknown [7.185.36.94]) by mail.maildlp.com (Postfix) with ESMTPS id BB3EE140259; Thu, 7 Mar 2024 17:39:08 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by dggpemd100001.china.huawei.com (7.185.36.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Thu, 7 Mar 2024 17:39:08 +0800 From: Xingui Yang To: , , , , CC: , , , , , Subject: [PATCH v3 3/3] scsi: libsas: Fix disk not being scanned in after being removed Date: Thu, 7 Mar 2024 09:37:33 +0000 Message-ID: <20240307093733.41222-4-yangxingui@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240307093733.41222-1-yangxingui@huawei.com> References: <20240307093733.41222-1-yangxingui@huawei.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemd100001.china.huawei.com (7.185.36.94) As of commit d8649fc1c5e4 ("scsi: libsas: Do discovery on empty PHY to update PHY info"), do discovery will send a new SMP_DISCOVER and update phy->phy_change_count. We found that if the disk is reconnected and phy change_count changes at this time, the disk scanning process will not be triggered. Therefore, call sas_set_ex_phy() to update the PHY info with the results of the last query. And because the previous phy info will be used when calling sas_unregister_devs_sas_addr(), sas_unregister_devs_sas_addr() should be called before sas_set_ex_phy(). Fixes: d8649fc1c5e4 ("scsi: libsas: Do discovery on empty PHY to update PHY info") Signed-off-by: Xingui Yang Reviewed-by: John Garry --- drivers/scsi/libsas/sas_expander.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index d6147616339f..5ef77a7d235e 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -1955,6 +1955,7 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, struct expander_device *ex = &dev->ex_dev; struct ex_phy *phy = &ex->ex_phy[phy_id]; enum sas_device_type type = SAS_PHY_UNUSED; + struct smp_disc_resp disc_resp; u8 sas_addr[SAS_ADDR_SIZE]; char msg[80] = ""; int res; @@ -1966,7 +1967,7 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, SAS_ADDR(dev->sas_addr), phy_id, msg); memset(sas_addr, 0, SAS_ADDR_SIZE); - res = sas_get_phy_attached_dev(dev, phy_id, sas_addr, &type); + res = sas_get_phy_discover(dev, phy_id, &disc_resp); switch (res) { case SMP_RESP_NO_PHY: phy->phy_state = PHY_NOT_PRESENT; @@ -1984,14 +1985,18 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, return res; } + if (res == 0) + sas_get_sas_addr_and_dev_type(&disc_resp, sas_addr, &type); + if ((SAS_ADDR(sas_addr) == 0) || (res == -ECOMM)) { phy->phy_state = PHY_EMPTY; sas_unregister_devs_sas_addr(dev, phy_id, last); /* - * Even though the PHY is empty, for convenience we discover - * the PHY to update the PHY info, like negotiated linkrate. + * Even though the PHY is empty, for convenience we update + * the PHY info, like negotiated linkrate. */ - sas_ex_phy_discover(dev, phy_id); + if (res == 0) + sas_set_ex_phy(dev, phy_id, &disc_resp); return res; } else if (SAS_ADDR(sas_addr) == SAS_ADDR(phy->attached_sas_addr) && dev_type_flutter(type, phy->attached_dev_type)) {