Skip to content

Commit 29ab0f6

Browse files
nathanlynchvijay-suman
authored andcommitted
dmaengine: Revert "dmaengine: dmatest: Fix dmatest waiting less when interrupted"
commit df180e65305f8c1e020d54bfc2132349fd693de1 upstream. Several issues with this change: * The analysis is flawed and it's unclear what problem is being fixed. There is no difference between wait_event_freezable_timeout() and wait_event_timeout() with respect to device interrupts. And of course "the interrupt notifying the finish of an operation happens during wait_event_freezable_timeout()" -- that's how it's supposed to work. * The link at the "Closes:" tag appears to be an unrelated use-after-free in idxd. * It introduces a regression: dmatest threads are meant to be freezable and this change breaks that. See discussion here: https://lore.kernel.org/dmaengine/[email protected]/ Fixes: e87ca16e9911 ("dmaengine: dmatest: Fix dmatest waiting less when interrupted") Signed-off-by: Nathan Lynch <[email protected]> Link: https://lore.kernel.org/r/20250403-dmaengine-dmatest-revert-waiting-less-v1-1-8227c5a3d7c8@amd.com Signed-off-by: Vinod Koul <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 530e67c4b01204cfbd9d1e6abc9423864f6c2ec6) Signed-off-by: Vijayendra Suman <[email protected]>
1 parent a7bac47 commit 29ab0f6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/dma/dmatest.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -828,9 +828,9 @@ static int dmatest_func(void *data)
828828
} else {
829829
dma_async_issue_pending(chan);
830830

831-
wait_event_timeout(thread->done_wait,
832-
done->done,
833-
msecs_to_jiffies(params->timeout));
831+
wait_event_freezable_timeout(thread->done_wait,
832+
done->done,
833+
msecs_to_jiffies(params->timeout));
834834

835835
status = dma_async_is_tx_complete(chan, cookie, NULL,
836836
NULL);

0 commit comments

Comments
 (0)