]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dmaengine: dmatest: Fix dmatest waiting less when interrupted
authorVinicius Costa Gomes <vinicius.gomes@intel.com>
Wed, 5 Mar 2025 23:00:06 +0000 (15:00 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 May 2025 05:41:18 +0000 (07:41 +0200)
[ Upstream commit e87ca16e99118ab4e130a41bdf12abbf6a87656c ]

Change the "wait for operation finish" logic to take interrupts into
account.

When using dmatest with idxd DMA engine, it's possible that during
longer tests, the interrupt notifying the finish of an operation
happens during wait_event_freezable_timeout(), which causes dmatest to
cleanup all the resources, some of which might still be in use.

This fix ensures that the wait logic correctly handles interrupts,
preventing premature cleanup of resources.

Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202502171134.8c403348-lkp@intel.com
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20250305230007.590178-1-vinicius.gomes@intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/dma/dmatest.c

index a3a172173e345fc867d1397189b1fbbc8ec3c428..915724fd7ea6f0dabf0add8999625145c18eee24 100644 (file)
@@ -825,9 +825,9 @@ static int dmatest_func(void *data)
                } else {
                        dma_async_issue_pending(chan);
 
-                       wait_event_freezable_timeout(thread->done_wait,
-                                       done->done,
-                                       msecs_to_jiffies(params->timeout));
+                       wait_event_timeout(thread->done_wait,
+                                          done->done,
+                                          msecs_to_jiffies(params->timeout));
 
                        status = dma_async_is_tx_complete(chan, cookie, NULL,
                                                          NULL);