From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795094384; b=fsQpr6dbH6uxlgFWtpRVJ0/L029BC+HPsx37QGPMuD2A5YsuHi6FxJ3s+WiYf8IOzd0V pBfCkhRm+gpk4+cFhLH/GsI1abKytbmOoLO8mbJeTMzt28wo8K+bVhAnqwit3McYhSx2N aVoZMqnfGyjMVm2IqpdYZe36e2hBt6e69h/Y6DXKjb0QSEa3StCl79da7p3CBTZuEYWpq kTzY+b+RYNFMjnG+q88e7VivutySiU+oIbRzxU8pCtQS9h/xqBF0gkwo+ouKN0cxKTQdJ cg2zvKaxMGI2z4+DS0bw4nMZTbMmlP7YYu+n1g33EGaTskhq8KrjFuVM3isYi/m4ycw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795094384; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=tqYW6qfCA89hjEn5S9pqMagRU23Yv0iJY1QqK9VwBZY=; b=0sIrkDT2FZ+PMpnLna+9Hau1H0Gn38Zuy8YPgC4zOyn95IezvXePCgTsAOlZnWNQkESy 6cpIIjRXFeueDl9TLSCrJRETtE7ulpYIwLGpPztEOmHEqYV30f+sqX0TOKglosDlv95hA XpRLiYHr27QEIgNEIchhFeulQdGvIo2W1/J1xZCyG+Nzlmlr23FFpENGe0PRvO4RQ5XRg FdBTEaq3v2NeYgB0DHEohnVrIKMWWvxhh28zzFZHLeCP+bVPHEmAYUalfn30+XQpbAK27 9ZgKRNK1d7QsytVVy0KZn949+OHCNWR4caOWTghaHZrRLqFoUfiBzq7ec00Gz3L5/0g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=cUMdBXQW; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7228F606A320; Thu, 19 Nov 2026 13:19:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=cUMdBXQW Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45BD31F000C4; Thu, 19 Nov 2026 13:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795094384; bh=tqYW6qfCA89hjEn5S9pqMagRU23Yv0iJY1QqK9VwBZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cUMdBXQWPwrmExTjmd3k4UHdq3e3AF8tfw03kNLYOkIghQLXXrteSD0JgH7nrp1WO kDoUisHmRH+urygOeK5JGPGx/YP9DMmKH+lZrji6Xp5C183puetxI3m9ngILxtDYtv vRFkeav0jbcQx8gjVvCVLG4Qfya7FKTO2HvwmJ20X3pWeGuWEXyS/tEMZIn8pCvBwv /Me5CdsmwbHBwb2/mxWvPcSvDHoRMVD1p/skM/7VDHr/cJLWGAnqlrAmXb5DrWltS6 Jw2gLuAniYfQvNFrldjuaJQJ2TgqA1b9qCulsW0iVZWhCgEQfmBNuc84UbEngjXZA+ os/qBDoL8d0tw== From: Philipp Stanner To: Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , Philipp Stanner , Simona Vetter , Chris Wilson , Danilo Krummrich , Gary Guo , Alice Ryhl , Daniel Almeida , Tvrtko Ursulin , "Paul E . McKenney" , Yunxiang Li , Alex Deucher , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 1/3] dma-buf/dma-fence: Ensure correct ordering in dma_fence_timestamp() Date: Thu, 19 Nov 2026 14:18:29 +0100 Message-ID: <20261119131830.2535266-3-phasta@kernel.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261119131830.2535266-2-phasta@kernel.org> References: <20261119131830.2535266-2-phasta@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit dma_fence_timestamp() tests two fence flags with test_bit(), not providing any ordering. The while loop + cpu_relax() seem to satisfy the desire to avoid locking, effectively rebuilding a locks spinning behavior in the rare case that a fence is signaling right now. Contrary to proper locking, however, correct memory ordering is not guaranteed. Ensure correct ordering with locking. Cc: stable@vger.kernel.org Fixes: b83ce9cb4a46 ("dma-buf: add dma_fence_timestamp helper") Signed-off-by: Philipp Stanner --- include/linux/dma-fence.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index dd07d128adc3..34aefb63a7fe 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -708,13 +708,17 @@ static inline void dma_fence_set_error(struct dma_fence *fence, */ static inline ktime_t dma_fence_timestamp(struct dma_fence *fence) { - if (WARN_ON(!test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags))) - return ktime_get(); + unsigned long flags; + ktime_t ret; - while (!test_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT, &fence->flags)) - cpu_relax(); + dma_fence_lock_irqsave(fence, flags); + if (WARN_ON(!dma_fence_test_signaled_flag(fence))) + ret = ktime_get(); + else + ret = fence->timestamp; + dma_fence_unlock_irqrestore(fence, flags); - return fence->timestamp; + return ret; } signed long dma_fence_wait_timeout(struct dma_fence *, -- 2.56.0