lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 147/210] dmaengine: ioat: stop mod_timer from resurrecting deleted timer in __cleanup()
    Date
    From: Dave Jiang <dave.jiang@intel.com>

    [ Upstream commit 898ec89dbb55b8294695ad71694a0684e62b2a73 ]

    User reports observing timer event report channel halted but no error
    observed in CHANERR register. The driver finished self-test and released
    channel resources. Debug shows that __cleanup() can call
    mod_timer() after the timer has been deleted and thus resurrect the
    timer. While harmless, it causes suprious error message to be emitted.
    Use mod_timer_pending() call to prevent deleted timer from being
    resurrected.

    Fixes: 3372de5813e4 ("dmaengine: ioatdma: removal of dma_v3.c and relevant ioat3 references")
    Signed-off-by: Dave Jiang <dave.jiang@intel.com>
    Link: https://lore.kernel.org/r/166360672197.3851724.17040290563764838369.stgit@djiang5-desk3.ch.intel.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/ioat/dma.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
    index 4c2b41beaf63..6f167a082832 100644
    --- a/drivers/dma/ioat/dma.c
    +++ b/drivers/dma/ioat/dma.c
    @@ -654,7 +654,7 @@ static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete)
    if (active - i == 0) {
    dev_dbg(to_dev(ioat_chan), "%s: cancel completion timeout\n",
    __func__);
    - mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
    + mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
    }

    /* microsecond delay by sysfs variable per pending descriptor */
    @@ -680,7 +680,7 @@ static void ioat_cleanup(struct ioatdma_chan *ioat_chan)

    if (chanerr &
    (IOAT_CHANERR_HANDLE_MASK | IOAT_CHANERR_RECOVER_MASK)) {
    - mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
    + mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
    ioat_eh(ioat_chan);
    }
    }
    @@ -872,7 +872,7 @@ static void check_active(struct ioatdma_chan *ioat_chan)
    }

    if (test_and_clear_bit(IOAT_CHAN_ACTIVE, &ioat_chan->state))
    - mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
    + mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
    }

    void ioat_timer_event(unsigned long data)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 14:41    [W:4.034 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site