lkml.org 
[lkml]   [2020]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 28/91] scsi: ufs: Fix unbalanced scsi_block_reqs_cnt caused by ufshcd_hold()
    Date
    From: Can Guo <cang@codeaurora.org>

    [ Upstream commit da3fecb0040324c08f1587e5bff1f15f36be1872 ]

    The scsi_block_reqs_cnt increased in ufshcd_hold() is supposed to be
    decreased back in ufshcd_ungate_work() in a paired way. However, if
    specific ufshcd_hold/release sequences are met, it is possible that
    scsi_block_reqs_cnt is increased twice but only one ungate work is
    queued. To make sure scsi_block_reqs_cnt is handled by ufshcd_hold() and
    ufshcd_ungate_work() in a paired way, increase it only if queue_work()
    returns true.

    Link: https://lore.kernel.org/r/1604384682-15837-2-git-send-email-cang@codeaurora.org
    Reviewed-by: Hongwu Su <hongwus@codeaurora.org>
    Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
    Reviewed-by: Bean Huo <beanhuo@micron.com>
    Signed-off-by: Can Guo <cang@codeaurora.org>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/ufs/ufshcd.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
    index b2cbdd01ab10b..a63119c35fde8 100644
    --- a/drivers/scsi/ufs/ufshcd.c
    +++ b/drivers/scsi/ufs/ufshcd.c
    @@ -1592,12 +1592,12 @@ int ufshcd_hold(struct ufs_hba *hba, bool async)
    * work and to enable clocks.
    */
    case CLKS_OFF:
    - ufshcd_scsi_block_requests(hba);
    hba->clk_gating.state = REQ_CLKS_ON;
    trace_ufshcd_clk_gating(dev_name(hba->dev),
    hba->clk_gating.state);
    - queue_work(hba->clk_gating.clk_gating_workq,
    - &hba->clk_gating.ungate_work);
    + if (queue_work(hba->clk_gating.clk_gating_workq,
    + &hba->clk_gating.ungate_work))
    + ufshcd_scsi_block_requests(hba);
    /*
    * fall through to check if we should wait for this
    * work to be done or not.
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-23 14:30    [W:3.093 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site