From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: "Christian König" <ckoenig.leichtzumerken@gmail.com>,
linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org,
linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org
Cc: daniel@ffwll.ch, tvrtko.ursulin@linux.intel.com
Subject: Re: [PATCH 20/28] drm/i915: use new iterator in i915_gem_object_wait_reservation
Date: Thu, 14 Oct 2021 14:04:26 +0200 [thread overview]
Message-ID: <5accca25-8ac3-47ca-ee56-8b33c208fc80@linux.intel.com> (raw)
In-Reply-To: <20211005113742.1101-21-christian.koenig@amd.com>
Op 05-10-2021 om 13:37 schreef Christian König:
> Simplifying the code a bit.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_wait.c | 51 +++++-------------------
> 1 file changed, 9 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
> index f909aaa09d9c..a13193db1dba 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
> @@ -37,55 +37,22 @@ i915_gem_object_wait_reservation(struct dma_resv *resv,
> unsigned int flags,
> long timeout)
> {
> - struct dma_fence *excl;
> - bool prune_fences = false;
> -
> - if (flags & I915_WAIT_ALL) {
> - struct dma_fence **shared;
> - unsigned int count, i;
> - int ret;
> + struct dma_resv_iter cursor;
> + struct dma_fence *fence;
>
> - ret = dma_resv_get_fences(resv, &excl, &count, &shared);
> - if (ret)
> - return ret;
> -
> - for (i = 0; i < count; i++) {
> - timeout = i915_gem_object_wait_fence(shared[i],
> - flags, timeout);
> - if (timeout < 0)
> - break;
> -
> - dma_fence_put(shared[i]);
> - }
> -
> - for (; i < count; i++)
> - dma_fence_put(shared[i]);
> - kfree(shared);
> -
> - /*
> - * If both shared fences and an exclusive fence exist,
> - * then by construction the shared fences must be later
> - * than the exclusive fence. If we successfully wait for
> - * all the shared fences, we know that the exclusive fence
> - * must all be signaled. If all the shared fences are
> - * signaled, we can prune the array and recover the
> - * floating references on the fences/requests.
> - */
> - prune_fences = count && timeout >= 0;
> - } else {
> - excl = dma_resv_get_excl_unlocked(resv);
> + dma_resv_iter_begin(&cursor, resv, flags & I915_WAIT_ALL);
> + dma_resv_for_each_fence_unlocked(&cursor, fence) {
> + timeout = i915_gem_object_wait_fence(fence, flags, timeout);
> + if (timeout < 0)
> + break;
> }
> -
> - if (excl && timeout >= 0)
> - timeout = i915_gem_object_wait_fence(excl, flags, timeout);
> -
> - dma_fence_put(excl);
> + dma_resv_iter_end(&cursor);
>
> /*
> * Opportunistically prune the fences iff we know they have *all* been
> * signaled.
> */
> - if (prune_fences)
> + if (timeout > 0)
> dma_resv_prune(resv);
>
> return timeout;
When replying to tvrtko about correctness of the conversion, I just now noticed a logic bug here, the same logic bug also affects dma_resv_wait_timeout.
long dma_resv_wait_timeout(struct dma_resv *obj, bool wait_all, bool intr,
unsigned long timeout)
{
long ret = timeout ? timeout : 1;
struct dma_resv_iter cursor;
struct dma_fence *fence;
dma_resv_iter_begin(&cursor, obj, wait_all);
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;
}
}
dma_resv_iter_end(&cursor);
return ret;
}
It fails to handle the case correctly when timeout = 0, I think the original code probably did.
dma_fence_wait_timeout should be called with timeout = 0 explicitly.
Fixed code for inner loop:
ret = dma_fence_wait_timeout(fence, intr, timeout);
if (ret <= 0) break;
if (timeout) timeout = ret;
This bug also affects i915_gem_object_wait_reservation, so the whole series might need to be
respinned, or at least checked, if more wait conversions are affected.
~Maarten
next prev parent reply other threads:[~2021-10-14 12:04 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-05 11:37 Deploying new iterator interface for dma-buf Christian König
2021-10-05 11:37 ` [PATCH 01/28] dma-buf: add dma_resv_for_each_fence_unlocked v8 Christian König
2021-10-05 11:37 ` [PATCH 02/28] dma-buf: add dma_resv_for_each_fence v2 Christian König
2021-10-06 8:24 ` Christian König
2021-10-06 8:40 ` Tvrtko Ursulin
2021-10-06 8:52 ` Tvrtko Ursulin
2021-10-05 11:37 ` [PATCH 03/28] dma-buf: add dma_resv selftest v3 Christian König
2021-10-13 14:04 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 04/28] dma-buf: use new iterator in dma_resv_copy_fences Christian König
2021-10-05 11:37 ` [PATCH 05/28] dma-buf: use new iterator in dma_resv_get_fences v3 Christian König
2021-10-05 11:37 ` [PATCH 06/28] dma-buf: use new iterator in dma_resv_wait_timeout Christian König
2021-10-05 11:37 ` [PATCH 07/28] dma-buf: use new iterator in dma_resv_test_signaled Christian König
2021-10-05 11:37 ` [PATCH 08/28] dma-buf: use the new iterator in dma_buf_debug_show Christian König
2021-10-05 11:37 ` [PATCH 09/28] dma-buf: use the new iterator in dma_resv_poll Christian König
2021-10-05 11:37 ` [PATCH 10/28] drm/ttm: use the new iterator in ttm_bo_flush_all_fences Christian König
2021-10-05 11:37 ` [PATCH 11/28] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König
2021-10-13 14:06 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 12/28] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König
2021-10-13 14:07 ` Daniel Vetter
2021-10-19 11:36 ` Christian König
2021-10-19 16:30 ` Felix Kuehling
2021-10-21 11:29 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 13/28] drm/amdgpu: use new iterator in amdgpu_vm_prt_fini Christian König
2021-10-13 14:12 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 14/28] drm/msm: use new iterator in msm_gem_describe Christian König
2021-10-13 14:14 ` Daniel Vetter
2021-10-19 11:49 ` Christian König
2021-10-21 11:30 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 15/28] drm/radeon: use new iterator in radeon_sync_resv Christian König
2021-10-13 14:15 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 16/28] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 Christian König
2021-10-17 14:40 ` Nicolas Frattaroli
2021-10-17 15:26 ` Christian König
2021-10-05 11:37 ` [PATCH 17/28] drm/i915: use the new iterator in i915_gem_busy_ioctl v2 Christian König
2021-10-05 12:40 ` Tvrtko Ursulin
2021-10-05 12:44 ` Christian König
2021-10-13 14:19 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 18/28] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Christian König
2021-10-05 11:37 ` [PATCH 19/28] drm/i915: use the new iterator in i915_request_await_object v2 Christian König
2021-10-05 11:37 ` [PATCH 20/28] drm/i915: use new iterator in i915_gem_object_wait_reservation Christian König
2021-10-14 12:04 ` Maarten Lankhorst [this message]
2021-10-05 11:37 ` [PATCH 21/28] drm/i915: use new iterator in i915_gem_object_wait_priority Christian König
2021-10-05 11:37 ` [PATCH 22/28] drm/i915: use new cursor in intel_prepare_plane_fb Christian König
2021-10-05 11:37 ` [PATCH 23/28] drm: use new iterator in drm_gem_fence_array_add_implicit v3 Christian König
2021-10-13 14:21 ` Daniel Vetter
2021-10-19 12:54 ` Christian König
2021-10-19 13:59 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 24/28] drm: use new iterator in drm_gem_plane_helper_prepare_fb v2 Christian König
2021-10-13 14:23 ` Daniel Vetter
2021-10-19 13:02 ` Christian König
2021-10-19 14:30 ` Daniel Vetter
2021-10-19 15:51 ` Christian König
2021-10-21 11:31 ` Daniel Vetter
2021-10-21 11:33 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 25/28] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König
2021-10-13 14:27 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 26/28] drm/nouveau: use the new interator in nv50_wndw_prepare_fb Christian König
2021-10-13 14:29 ` Daniel Vetter
2021-10-22 13:17 ` Christian König
2021-10-28 15:26 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 27/28] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König
2021-10-13 14:31 ` Daniel Vetter
2021-10-05 11:37 ` [PATCH 28/28] drm/etnaviv: replace dma_resv_get_excl_unlocked Christian König
2021-10-13 14:32 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2021-10-01 10:05 Deploying new iterator interface for dma-buf Christian König
2021-10-01 10:06 ` [PATCH 20/28] drm/i915: use new iterator in i915_gem_object_wait_reservation Christian König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5accca25-8ac3-47ca-ee56-8b33c208fc80@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=ckoenig.leichtzumerken@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-media@vger.kernel.org \
--cc=tvrtko.ursulin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).