From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D078220766C; Tue, 8 Jul 2025 16:36:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751992581; cv=none; b=oVvj2wKw3zwzMl4DCceRpwuCUb+m/mWakPJagi0Eu7mgi+ud0nN4FO5zszA3PqMLo1OZl04RVwTi0hu0oLWGtprHJN+5Ni00z9vpW32aSwCwnO0PgZzJ4X2NDkMmfufGCGdJny/9yHR32jI0jZ7aZaN6E2Lc0DyvETdih2SJ7nE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751992581; c=relaxed/simple; bh=H+DmmtjsS8cDfOyJ92D/HjJ7HA+Tk9gUwZj4jNtY+x0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=t/ZcZtnUwljItUlY2w0e+w4Q0+UCA0sjElqormRnIZeCUA7BKCJZ0FVL/ol8NLjaS2GgRi3MQpU1swmOyUS96iaWKnTI5olrmUxJrjLweP9m+v8QIqdCsgk++SudyKcpTqHEcWN/RXWygLFHFTEq474sEuyW4zFSO0rqQhWQbXw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zvSIsxPL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zvSIsxPL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58410C4CEED; Tue, 8 Jul 2025 16:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1751992581; bh=H+DmmtjsS8cDfOyJ92D/HjJ7HA+Tk9gUwZj4jNtY+x0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zvSIsxPLCam2DI8sI9RrYr85Oozn8q2T/MSjtoYXP4NsgMELERowVU2y5+ABQyB08 lUyCxkEkAI307YSQPhobx1JRgPQUeVeBf3Tq2/8NJwcrj3k1eHTG5qH0je1dGeeShb vPMJIXdsZrF2zymvrUuhzFnsiHkyWQumgttRvd1s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= , Lucas Stach , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 6.6 118/132] dma-buf: fix timeout handling in dma_resv_wait_timeout v2 Date: Tue, 8 Jul 2025 18:23:49 +0200 Message-ID: <20250708162234.004682921@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250708162230.765762963@linuxfoundation.org> References: <20250708162230.765762963@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian König commit 2b95a7db6e0f75587bffddbb490399cbb87e4985 upstream. 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: Marek Olšák Reported-by: Lucas Stach Signed-off-by: Christian König Reviewed-by: Lucas Stach Cc: Link: https://lore.kernel.org/r/20250129105841.1806-1-christian.koenig@amd.com Signed-off-by: Greg Kroah-Hartman --- drivers/dma-buf/dma-resv.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -678,11 +678,13 @@ long dma_resv_wait_timeout(struct dma_re 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);