lkml.org 
[lkml]   [2021]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 044/177] dmaengine: idxd: fix calling wq quiesce inside spinlock
    Date
    From: Dave Jiang <dave.jiang@intel.com>

    [ Upstream commit fa51b16d05583c7aebbc06330afb50276243d198 ]

    Dan reports that smatch has found idxd_wq_quiesce() is being called inside
    the idxd->dev_lock. idxd_wq_quiesce() calls wait_for_completion() and
    therefore it can sleep. Move the call outside of the spinlock as it does
    not need device lock.

    Fixes: 5b0c68c473a1 ("dmaengine: idxd: support reporting of halt interrupt")
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Dave Jiang <dave.jiang@intel.com>
    Link: https://lore.kernel.org/r/163716858508.1721911.15051495873516709923.stgit@djiang5-desk3.ch.intel.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/idxd/irq.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/dma/idxd/irq.c b/drivers/dma/idxd/irq.c
    index 3261ea247e832..6d6af0dc3c0ec 100644
    --- a/drivers/dma/idxd/irq.c
    +++ b/drivers/dma/idxd/irq.c
    @@ -137,10 +137,10 @@ static int process_misc_interrupts(struct idxd_device *idxd, u32 cause)
    INIT_WORK(&idxd->work, idxd_device_reinit);
    queue_work(idxd->wq, &idxd->work);
    } else {
    - spin_lock(&idxd->dev_lock);
    idxd->state = IDXD_DEV_HALTED;
    idxd_wqs_quiesce(idxd);
    idxd_wqs_unmap_portal(idxd);
    + spin_lock(&idxd->dev_lock);
    idxd_device_clear_state(idxd);
    dev_err(&idxd->pdev->dev,
    "idxd halted, need %s.\n",
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-12-20 15:57    [W:4.428 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site