Add the missing destroy_workqueue() before return from
ufshcd_init in the error handling case as well as in
ufshcd_remove.
Fixes: 4db7a2360597 ("scsi: ufs: Fix concurrency of error handler and other error recovery paths")
Suggested-by: Avri Altman <[email protected]>
Signed-off-by: Qinglang Miao <[email protected]>
---
v2: consider missing destroy_workqueue ufshcd_remove either.
drivers/scsi/ufs/ufshcd.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index b8f573a02713..adbdda4f556b 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -8906,6 +8906,7 @@ void ufshcd_remove(struct ufs_hba *hba)
blk_mq_free_tag_set(&hba->tmf_tag_set);
blk_cleanup_queue(hba->cmd_queue);
scsi_remove_host(hba->host);
+ destroy_workqueue(hba->eh_wq);
/* disable interrupts */
ufshcd_disable_intr(hba, hba->intr_mask);
ufshcd_hba_stop(hba);
@@ -9206,6 +9207,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
exit_gating:
ufshcd_exit_clk_scaling(hba);
ufshcd_exit_clk_gating(hba);
+ destroy_workqueue(hba->eh_wq);
out_disable:
hba->is_irq_enabled = false;
ufshcd_hba_exit(hba);
--
2.23.0
>
>
> Add the missing destroy_workqueue() before return from
> ufshcd_init in the error handling case as well as in
> ufshcd_remove.
>
> Fixes: 4db7a2360597 ("scsi: ufs: Fix concurrency of error handler and other
> error recovery paths")
> Suggested-by: Avri Altman <[email protected]>
> Signed-off-by: Qinglang Miao <[email protected]>
Reviewed-by: Avri Altman <[email protected]>
> ---
> v2: consider missing destroy_workqueue ufshcd_remove either.
>
> drivers/scsi/ufs/ufshcd.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index b8f573a02713..adbdda4f556b 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -8906,6 +8906,7 @@ void ufshcd_remove(struct ufs_hba *hba)
> blk_mq_free_tag_set(&hba->tmf_tag_set);
> blk_cleanup_queue(hba->cmd_queue);
> scsi_remove_host(hba->host);
> + destroy_workqueue(hba->eh_wq);
> /* disable interrupts */
> ufshcd_disable_intr(hba, hba->intr_mask);
> ufshcd_hba_stop(hba);
> @@ -9206,6 +9207,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem
> *mmio_base, unsigned int irq)
> exit_gating:
> ufshcd_exit_clk_scaling(hba);
> ufshcd_exit_clk_gating(hba);
> + destroy_workqueue(hba->eh_wq);
> out_disable:
> hba->is_irq_enabled = false;
> ufshcd_hba_exit(hba);
> --
> 2.23.0
On 11/9/2020 11:42 PM, Qinglang Miao wrote:
> Add the missing destroy_workqueue() before return from
> ufshcd_init in the error handling case as well as in
> ufshcd_remove.
>
> Fixes: 4db7a2360597 ("scsi: ufs: Fix concurrency of error handler and other error recovery paths")
> Suggested-by: Avri Altman <[email protected]>
> Signed-off-by: Qinglang Miao <[email protected]>
> ---
Reviewed-by: Asutosh Das <[email protected]>
> v2: consider missing destroy_workqueue ufshcd_remove either.
>
> drivers/scsi/ufs/ufshcd.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index b8f573a02713..adbdda4f556b 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -8906,6 +8906,7 @@ void ufshcd_remove(struct ufs_hba *hba)
> blk_mq_free_tag_set(&hba->tmf_tag_set);
> blk_cleanup_queue(hba->cmd_queue);
> scsi_remove_host(hba->host);
> + destroy_workqueue(hba->eh_wq);
> /* disable interrupts */
> ufshcd_disable_intr(hba, hba->intr_mask);
> ufshcd_hba_stop(hba);
> @@ -9206,6 +9207,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
> exit_gating:
> ufshcd_exit_clk_scaling(hba);
> ufshcd_exit_clk_gating(hba);
> + destroy_workqueue(hba->eh_wq);
> out_disable:
> hba->is_irq_enabled = false;
> ufshcd_hba_exit(hba);
>
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
Linux Foundation Collaborative Project
On Tue, 10 Nov 2020 15:42:23 +0800, Qinglang Miao wrote:
> Add the missing destroy_workqueue() before return from
> ufshcd_init in the error handling case as well as in
> ufshcd_remove.
Applied to 5.10/scsi-fixes, thanks!
[1/1] scsi: ufshcd: Fix missing destroy_workqueue()
https://git.kernel.org/mkp/scsi/c/2e6f11a797a2
--
Martin K. Petersen Oracle Linux Engineering