Re: [PATCH v2 02/11] dmaengine: ae4dma: Let the pending work exit before cancelling it
From: Frank Li
Date: Tue Nov 17 2026 - 14:39:36 EST
On Tue, Nov 17, 2026 at 04:37:03PM +0000, Lee Jones wrote:
> ae4_pending_work() loops forever waiting for interrupts, so it never
> returns once it has started running, which it does 100us after probe.
> ae4_destroy_work() calls cancel_delayed_work_sync() on it, which waits
> for the running work to finish and therefore blocks indefinitely,
> hanging device removal and, once the work has started, the probe error
> path in ae4_core_init().
>
> Add a per-queue stop flag that ae4_destroy_work() sets, then wake the
> queue's wait queue so that the work leaves its loop before it is
> cancelled and its workqueue destroyed.
>
> Fixes: 90a30e268d9b ("dmaengine: ae4dma: Add AMD ae4dma controller driver")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Lee Jones <lee@xxxxxxxxxx>
> ---
Reviewed-by: Frank Li <Frank.Li@xxxxxxx>
>
> v1 => v2: New patch, so that ae4_destroy_work() can no longer hang
>
> drivers/dma/amd/ae4dma/ae4dma-dev.c | 8 ++++++++
> drivers/dma/amd/ae4dma/ae4dma.h | 1 +
> 2 files changed, 9 insertions(+)
>
> diff --git a/drivers/dma/amd/ae4dma/ae4dma-dev.c b/drivers/dma/amd/ae4dma/ae4dma-dev.c
> index 8de3bef41b58..be86188da16c 100644
> --- a/drivers/dma/amd/ae4dma/ae4dma-dev.c
> +++ b/drivers/dma/amd/ae4dma/ae4dma-dev.c
> @@ -23,9 +23,13 @@ static void ae4_pending_work(struct work_struct *work)
>
> for (;;) {
> wait_event_interruptible(ae4cmd_q->q_w,
> + READ_ONCE(ae4cmd_q->stop) ||
> ((atomic64_read(&ae4cmd_q->done_cnt)) <
> atomic64_read(&ae4cmd_q->intr_cnt)));
>
> + if (READ_ONCE(ae4cmd_q->stop))
> + break;
> +
> atomic64_inc(&ae4cmd_q->done_cnt);
>
> mutex_lock(&ae4cmd_q->cmd_lock);
> @@ -81,6 +85,10 @@ void ae4_destroy_work(struct ae4_device *ae4)
> if (!ae4cmd_q->pws)
> break;
>
> + /* Make ae4_pending_work() leave its loop so that it can be cancelled */
> + WRITE_ONCE(ae4cmd_q->stop, true);
> + wake_up(&ae4cmd_q->q_w);
> +
> cancel_delayed_work_sync(&ae4cmd_q->p_work);
> destroy_workqueue(ae4cmd_q->pws);
> }
> diff --git a/drivers/dma/amd/ae4dma/ae4dma.h b/drivers/dma/amd/ae4dma/ae4dma.h
> index 57f6048726bb..affb1d7d9d7d 100644
> --- a/drivers/dma/amd/ae4dma/ae4dma.h
> +++ b/drivers/dma/amd/ae4dma/ae4dma.h
> @@ -60,6 +60,7 @@ struct ae4_cmd_queue {
> u32 dridx;
> u32 tail_wi;
> u32 id;
> + bool stop;
> };
>
> union dwou {
> --
> 2.56.0.679.gc527c65306-goog
>