From: Greg Kroah-Hartman Date: Mon, 1 Apr 2024 13:40:56 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.7.12~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afbbb2f327f1bae3273f0784490ba5cb0b66bf08;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: scsi-libsas-fix-disk-not-being-scanned-in-after-being-removed.patch scsi-lpfc-correct-size-for-cmdwqe-rspwqe-for-memset.patch scsi-lpfc-correct-size-for-wqe-for-memset.patch --- diff --git a/queue-6.1/scsi-libsas-fix-disk-not-being-scanned-in-after-being-removed.patch b/queue-6.1/scsi-libsas-fix-disk-not-being-scanned-in-after-being-removed.patch new file mode 100644 index 00000000000..c189df030f5 --- /dev/null +++ b/queue-6.1/scsi-libsas-fix-disk-not-being-scanned-in-after-being-removed.patch @@ -0,0 +1,111 @@ +From 8e68a458bcf5b5cb9c3624598bae28f08251601f Mon Sep 17 00:00:00 2001 +From: Xingui Yang +Date: Thu, 7 Mar 2024 14:14:13 +0000 +Subject: scsi: libsas: Fix disk not being scanned in after being removed + +From: Xingui Yang + +commit 8e68a458bcf5b5cb9c3624598bae28f08251601f upstream. + +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 +Link: https://lore.kernel.org/r/20240307141413.48049-3-yangxingui@huawei.com +Reviewed-by: John Garry +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/libsas/sas_expander.c | 32 ++++++++++++++++++++++---------- + 1 file changed, 22 insertions(+), 10 deletions(-) + +--- a/drivers/scsi/libsas/sas_expander.c ++++ b/drivers/scsi/libsas/sas_expander.c +@@ -1972,6 +1972,7 @@ static int sas_rediscover_dev(struct dom + 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; +@@ -1983,33 +1984,41 @@ static int sas_rediscover_dev(struct dom + 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); ++ disc_resp = alloc_smp_resp(DISCOVER_RESP_SIZE); ++ if (!disc_resp) ++ return -ENOMEM; ++ ++ res = sas_get_phy_discover(dev, phy_id, disc_resp); + switch (res) { + case SMP_RESP_NO_PHY: + phy->phy_state = PHY_NOT_PRESENT; + sas_unregister_devs_sas_addr(dev, phy_id, last); +- return res; ++ goto out_free_resp; + case SMP_RESP_PHY_VACANT: + phy->phy_state = PHY_VACANT; + sas_unregister_devs_sas_addr(dev, phy_id, last); +- return res; ++ goto out_free_resp; + case SMP_RESP_FUNC_ACC: + break; + case -ECOMM: + break; + default: +- return res; ++ goto out_free_resp; + } + ++ 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); +- return res; ++ if (res == 0) ++ sas_set_ex_phy(dev, phy_id, disc_resp); ++ goto out_free_resp; + } else if (SAS_ADDR(sas_addr) == SAS_ADDR(phy->attached_sas_addr) && + dev_type_flutter(type, phy->attached_dev_type)) { + struct domain_device *ata_dev = sas_ex_to_ata(dev, phy_id); +@@ -2021,7 +2030,7 @@ static int sas_rediscover_dev(struct dom + action = ", needs recovery"; + pr_debug("ex %016llx phy%02d broadcast flutter%s\n", + SAS_ADDR(dev->sas_addr), phy_id, action); +- return res; ++ goto out_free_resp; + } + + /* we always have to delete the old device when we went here */ +@@ -2030,7 +2039,10 @@ static int sas_rediscover_dev(struct dom + SAS_ADDR(phy->attached_sas_addr)); + sas_unregister_devs_sas_addr(dev, phy_id, last); + +- return sas_discover_new(dev, phy_id); ++ res = sas_discover_new(dev, phy_id); ++out_free_resp: ++ kfree(disc_resp); ++ return res; + } + + /** diff --git a/queue-6.1/scsi-lpfc-correct-size-for-cmdwqe-rspwqe-for-memset.patch b/queue-6.1/scsi-lpfc-correct-size-for-cmdwqe-rspwqe-for-memset.patch new file mode 100644 index 00000000000..9611c687e00 --- /dev/null +++ b/queue-6.1/scsi-lpfc-correct-size-for-cmdwqe-rspwqe-for-memset.patch @@ -0,0 +1,37 @@ +From 16cc2ba71b9f6440805aef7f92ba0f031f79b765 Mon Sep 17 00:00:00 2001 +From: Muhammad Usama Anjum +Date: Mon, 4 Mar 2024 14:11:19 +0500 +Subject: scsi: lpfc: Correct size for cmdwqe/rspwqe for memset() + +From: Muhammad Usama Anjum + +commit 16cc2ba71b9f6440805aef7f92ba0f031f79b765 upstream. + +The cmdwqe and rspwqe are of type lpfc_wqe128. They should be memset() with +the same type. + +Fixes: 61910d6a5243 ("scsi: lpfc: SLI path split: Refactor CT paths") +Signed-off-by: Muhammad Usama Anjum +Link: https://lore.kernel.org/r/20240304091119.847060-1-usama.anjum@collabora.com +Reviewed-by: Justin Tee +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/lpfc/lpfc_bsg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/scsi/lpfc/lpfc_bsg.c ++++ b/drivers/scsi/lpfc/lpfc_bsg.c +@@ -3169,10 +3169,10 @@ lpfc_bsg_diag_loopback_run(struct bsg_jo + } + + cmdwqe = &cmdiocbq->wqe; +- memset(cmdwqe, 0, sizeof(union lpfc_wqe)); ++ memset(cmdwqe, 0, sizeof(*cmdwqe)); + if (phba->sli_rev < LPFC_SLI_REV4) { + rspwqe = &rspiocbq->wqe; +- memset(rspwqe, 0, sizeof(union lpfc_wqe)); ++ memset(rspwqe, 0, sizeof(*rspwqe)); + } + + INIT_LIST_HEAD(&head); diff --git a/queue-6.1/scsi-lpfc-correct-size-for-wqe-for-memset.patch b/queue-6.1/scsi-lpfc-correct-size-for-wqe-for-memset.patch new file mode 100644 index 00000000000..e0888a6c43f --- /dev/null +++ b/queue-6.1/scsi-lpfc-correct-size-for-wqe-for-memset.patch @@ -0,0 +1,33 @@ +From 28d41991182c210ec1654f8af2e140ef4cc73f20 Mon Sep 17 00:00:00 2001 +From: Muhammad Usama Anjum +Date: Mon, 4 Mar 2024 14:06:48 +0500 +Subject: scsi: lpfc: Correct size for wqe for memset() + +From: Muhammad Usama Anjum + +commit 28d41991182c210ec1654f8af2e140ef4cc73f20 upstream. + +The wqe is of type lpfc_wqe128. It should be memset with the same type. + +Fixes: 6c621a2229b0 ("scsi: lpfc: Separate NVMET RQ buffer posting from IO resources SGL/iocbq/context") +Signed-off-by: Muhammad Usama Anjum +Link: https://lore.kernel.org/r/20240304090649.833953-1-usama.anjum@collabora.com +Reviewed-by: AngeloGioacchino Del Regno +Reviewed-by: Justin Tee +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/scsi/lpfc/lpfc_nvmet.c ++++ b/drivers/scsi/lpfc/lpfc_nvmet.c +@@ -1586,7 +1586,7 @@ lpfc_nvmet_setup_io_context(struct lpfc_ + wqe = &nvmewqe->wqe; + + /* Initialize WQE */ +- memset(wqe, 0, sizeof(union lpfc_wqe)); ++ memset(wqe, 0, sizeof(*wqe)); + + ctx_buf->iocbq->cmd_dmabuf = NULL; + spin_lock(&phba->sli4_hba.sgl_list_lock); diff --git a/queue-6.1/series b/queue-6.1/series index b35f7fa3d40..692aba1e2f0 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -263,3 +263,6 @@ scsi-qla2xxx-change-debug-message-during-driver-unload.patch scsi-qla2xxx-delay-i-o-abort-on-pci-error.patch x86-cpu-enable-stibp-on-amd-if-automatic-ibrs-is-enabled.patch tls-fix-use-after-free-on-failed-backlog-decryption.patch +scsi-lpfc-correct-size-for-cmdwqe-rspwqe-for-memset.patch +scsi-lpfc-correct-size-for-wqe-for-memset.patch +scsi-libsas-fix-disk-not-being-scanned-in-after-being-removed.patch