Commit 2b95a7db authored by Christian König's avatar Christian König
Browse files

dma-buf: fix timeout handling in dma_resv_wait_timeout v2 



Even the kerneldoc says that with a zero timeout the function should not
wait for anything, but still return 1 to indicate that the fences are
signaled now.

Unfortunately that isn't what was implemented, instead of only returning
1 we also waited for at least one jiffies.

Fix that by adjusting the handling to what the function is actually
documented to do.

v2: improve code readability

Reported-by: default avatarMarek Olšák <marek.olsak@amd.com>
Reported-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarLucas Stach <l.stach@pengutronix.de>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20250129105841.1806-1-christian.koenig@amd.com
parent 615cc422

drivers/dma-buf/dma-resv.c

+7 −5
Original line number Diff line number Diff line
@@ -685,11 +685,13 @@ long dma_resv_wait_timeout(struct dma_resv *obj, enum dma_resv_usage usage, 
	dma_resv_iter_begin(&cursor, obj, usage);

	dma_resv_for_each_fence_unlocked(&cursor, fence) {



		ret = dma_fence_wait_timeout(fence, intr, ret);

		if (ret <= 0) {

			dma_resv_iter_end(&cursor);

			return ret;

		}

		ret = dma_fence_wait_timeout(fence, intr, timeout);

		if (ret <= 0)

			break;



		/* Even for zero timeout the return value is 1 */

		if (timeout)

			timeout = ret;

	}

	dma_resv_iter_end(&cursor);