From: Daniel Vetter <daniel@ffwll.ch> To: "Christian König" <ckoenig.leichtzumerken@gmail.com> Cc: linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org, daniel@ffwll.ch Subject: Re: [PATCH 03/26] dma-buf: use new iterator in dma_resv_copy_fences Date: Fri, 17 Sep 2021 16:35:22 +0200 [thread overview] Message-ID: <YUSnqqsMjXOPNB6W@phenom.ffwll.local> (raw) In-Reply-To: <20210917123513.1106-4-christian.koenig@amd.com> On Fri, Sep 17, 2021 at 02:34:50PM +0200, Christian König wrote: > This makes the function much simpler since the complex > retry logic is now handled else where. > > Signed-off-by: Christian König <christian.koenig@amd.com> > --- > drivers/dma-buf/dma-resv.c | 86 ++++++++++++++++---------------------- > 1 file changed, 35 insertions(+), 51 deletions(-) > > diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c > index a3c79a99fb44..406150dea5e4 100644 > --- a/drivers/dma-buf/dma-resv.c > +++ b/drivers/dma-buf/dma-resv.c > @@ -426,74 +426,58 @@ EXPORT_SYMBOL_GPL(dma_resv_iter_walk); > */ > int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) > { > - struct dma_resv_list *src_list, *dst_list; > - struct dma_fence *old, *new; > - unsigned int i; > + struct dma_resv_iter cursor; > + struct dma_resv_list *list; > + struct dma_fence *f, *excl; > > dma_resv_assert_held(dst); > > - rcu_read_lock(); > - src_list = dma_resv_shared_list(src); > - > -retry: > - if (src_list) { > - unsigned int shared_count = src_list->shared_count; > - > - rcu_read_unlock(); > + list = NULL; > + excl = NULL; > > - dst_list = dma_resv_list_alloc(shared_count); > - if (!dst_list) > - return -ENOMEM; > + rcu_read_lock(); > + dma_resv_iter_begin(&cursor, src, true); > + dma_resv_for_each_fence_unlocked(&cursor, f) { > > - rcu_read_lock(); > - src_list = dma_resv_shared_list(src); > - if (!src_list || src_list->shared_count > shared_count) { > - kfree(dst_list); > - goto retry; > - } > + if (cursor.is_first) { Maybe have a wrapper for this, like dma_resv_iter_is_reset or is_first or is_restart (my preference) with some nice docs that this returns true everytime we had to restart the sequence? Otherwise I fully agree, this is so much better with all the hairy restarting and get_rcu and test_bit shovelled away somewhere. Either way (but I much prefer a wrapper for is_first): Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > + dma_resv_list_free(list); > + dma_fence_put(excl); > > - dst_list->shared_count = 0; > - for (i = 0; i < src_list->shared_count; ++i) { > - struct dma_fence __rcu **dst; > - struct dma_fence *fence; > + if (cursor.fences) { > + unsigned int cnt = cursor.fences->shared_count; > > - fence = rcu_dereference(src_list->shared[i]); > - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, > - &fence->flags)) > - continue; > + rcu_read_unlock(); > + list = dma_resv_list_alloc(cnt); > + if (!list) { > + dma_resv_iter_end(&cursor); > + return -ENOMEM; > + } > > - if (!dma_fence_get_rcu(fence)) { > - dma_resv_list_free(dst_list); > - src_list = dma_resv_shared_list(src); > - goto retry; > - } > + list->shared_count = 0; > + rcu_read_lock(); > > - if (dma_fence_is_signaled(fence)) { > - dma_fence_put(fence); > - continue; > + } else { > + list = NULL; > } > - > - dst = &dst_list->shared[dst_list->shared_count++]; > - rcu_assign_pointer(*dst, fence); > + excl = NULL; > } > - } else { > - dst_list = NULL; > - } > > - new = dma_fence_get_rcu_safe(&src->fence_excl); > + dma_fence_get(f); > + if (dma_resv_iter_is_exclusive(&cursor)) > + excl = f; > + else > + RCU_INIT_POINTER(list->shared[list->shared_count++], f); > + } > + dma_resv_iter_end(&cursor); > rcu_read_unlock(); > > - src_list = dma_resv_shared_list(dst); > - old = dma_resv_excl_fence(dst); > - > write_seqcount_begin(&dst->seq); > - /* write_seqcount_begin provides the necessary memory barrier */ > - RCU_INIT_POINTER(dst->fence_excl, new); > - RCU_INIT_POINTER(dst->fence, dst_list); > + excl = rcu_replace_pointer(dst->fence_excl, excl, dma_resv_held(dst)); > + list = rcu_replace_pointer(dst->fence, list, dma_resv_held(dst)); > write_seqcount_end(&dst->seq); > > - dma_resv_list_free(src_list); > - dma_fence_put(old); > + dma_resv_list_free(list); > + dma_fence_put(excl); > > return 0; > } > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID
From: Daniel Vetter <daniel@ffwll.ch> To: "Christian König" <ckoenig.leichtzumerken@gmail.com> Cc: linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org, daniel@ffwll.ch Subject: Re: [Intel-gfx] [PATCH 03/26] dma-buf: use new iterator in dma_resv_copy_fences Date: Fri, 17 Sep 2021 16:35:22 +0200 [thread overview] Message-ID: <YUSnqqsMjXOPNB6W@phenom.ffwll.local> (raw) In-Reply-To: <20210917123513.1106-4-christian.koenig@amd.com> On Fri, Sep 17, 2021 at 02:34:50PM +0200, Christian König wrote: > This makes the function much simpler since the complex > retry logic is now handled else where. > > Signed-off-by: Christian König <christian.koenig@amd.com> > --- > drivers/dma-buf/dma-resv.c | 86 ++++++++++++++++---------------------- > 1 file changed, 35 insertions(+), 51 deletions(-) > > diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c > index a3c79a99fb44..406150dea5e4 100644 > --- a/drivers/dma-buf/dma-resv.c > +++ b/drivers/dma-buf/dma-resv.c > @@ -426,74 +426,58 @@ EXPORT_SYMBOL_GPL(dma_resv_iter_walk); > */ > int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) > { > - struct dma_resv_list *src_list, *dst_list; > - struct dma_fence *old, *new; > - unsigned int i; > + struct dma_resv_iter cursor; > + struct dma_resv_list *list; > + struct dma_fence *f, *excl; > > dma_resv_assert_held(dst); > > - rcu_read_lock(); > - src_list = dma_resv_shared_list(src); > - > -retry: > - if (src_list) { > - unsigned int shared_count = src_list->shared_count; > - > - rcu_read_unlock(); > + list = NULL; > + excl = NULL; > > - dst_list = dma_resv_list_alloc(shared_count); > - if (!dst_list) > - return -ENOMEM; > + rcu_read_lock(); > + dma_resv_iter_begin(&cursor, src, true); > + dma_resv_for_each_fence_unlocked(&cursor, f) { > > - rcu_read_lock(); > - src_list = dma_resv_shared_list(src); > - if (!src_list || src_list->shared_count > shared_count) { > - kfree(dst_list); > - goto retry; > - } > + if (cursor.is_first) { Maybe have a wrapper for this, like dma_resv_iter_is_reset or is_first or is_restart (my preference) with some nice docs that this returns true everytime we had to restart the sequence? Otherwise I fully agree, this is so much better with all the hairy restarting and get_rcu and test_bit shovelled away somewhere. Either way (but I much prefer a wrapper for is_first): Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > + dma_resv_list_free(list); > + dma_fence_put(excl); > > - dst_list->shared_count = 0; > - for (i = 0; i < src_list->shared_count; ++i) { > - struct dma_fence __rcu **dst; > - struct dma_fence *fence; > + if (cursor.fences) { > + unsigned int cnt = cursor.fences->shared_count; > > - fence = rcu_dereference(src_list->shared[i]); > - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, > - &fence->flags)) > - continue; > + rcu_read_unlock(); > + list = dma_resv_list_alloc(cnt); > + if (!list) { > + dma_resv_iter_end(&cursor); > + return -ENOMEM; > + } > > - if (!dma_fence_get_rcu(fence)) { > - dma_resv_list_free(dst_list); > - src_list = dma_resv_shared_list(src); > - goto retry; > - } > + list->shared_count = 0; > + rcu_read_lock(); > > - if (dma_fence_is_signaled(fence)) { > - dma_fence_put(fence); > - continue; > + } else { > + list = NULL; > } > - > - dst = &dst_list->shared[dst_list->shared_count++]; > - rcu_assign_pointer(*dst, fence); > + excl = NULL; > } > - } else { > - dst_list = NULL; > - } > > - new = dma_fence_get_rcu_safe(&src->fence_excl); > + dma_fence_get(f); > + if (dma_resv_iter_is_exclusive(&cursor)) > + excl = f; > + else > + RCU_INIT_POINTER(list->shared[list->shared_count++], f); > + } > + dma_resv_iter_end(&cursor); > rcu_read_unlock(); > > - src_list = dma_resv_shared_list(dst); > - old = dma_resv_excl_fence(dst); > - > write_seqcount_begin(&dst->seq); > - /* write_seqcount_begin provides the necessary memory barrier */ > - RCU_INIT_POINTER(dst->fence_excl, new); > - RCU_INIT_POINTER(dst->fence, dst_list); > + excl = rcu_replace_pointer(dst->fence_excl, excl, dma_resv_held(dst)); > + list = rcu_replace_pointer(dst->fence, list, dma_resv_held(dst)); > write_seqcount_end(&dst->seq); > > - dma_resv_list_free(src_list); > - dma_fence_put(old); > + dma_resv_list_free(list); > + dma_fence_put(excl); > > return 0; > } > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
next prev parent reply other threads:[~2021-09-17 14:35 UTC|newest] Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-17 12:34 Deploying new iterator interface for dma-buf Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 01/26] dma-buf: add dma_resv_for_each_fence_unlocked v2 Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 13:23 ` Daniel Vetter 2021-09-17 13:23 ` [Intel-gfx] " Daniel Vetter 2021-09-20 8:43 ` Tvrtko Ursulin 2021-09-20 10:09 ` Christian König 2021-09-20 10:26 ` Tvrtko Ursulin 2021-09-17 12:34 ` [PATCH 02/26] dma-buf: add dma_resv_for_each_fence Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 13:27 ` Daniel Vetter 2021-09-17 13:27 ` [Intel-gfx] " Daniel Vetter 2021-09-17 14:30 ` Daniel Vetter 2021-09-17 14:30 ` Daniel Vetter 2021-09-17 12:34 ` [PATCH 03/26] dma-buf: use new iterator in dma_resv_copy_fences Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:35 ` Daniel Vetter [this message] 2021-09-17 14:35 ` Daniel Vetter 2021-09-20 7:23 ` Christian König 2021-09-20 7:23 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 04/26] dma-buf: use new iterator in dma_resv_get_fences v2 Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:39 ` Daniel Vetter 2021-09-17 14:39 ` [Intel-gfx] " Daniel Vetter 2021-09-17 12:34 ` [PATCH 05/26] dma-buf: use new iterator in dma_resv_wait_timeout Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:43 ` Daniel Vetter 2021-09-17 14:43 ` [Intel-gfx] " Daniel Vetter 2021-09-20 7:27 ` Christian König 2021-09-20 7:27 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 06/26] dma-buf: use new iterator in dma_resv_test_signaled Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:45 ` Daniel Vetter 2021-09-17 14:45 ` [Intel-gfx] " Daniel Vetter 2021-09-17 12:34 ` [PATCH 07/26] drm/ttm: use the new iterator in ttm_bo_flush_all_fences Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:50 ` Daniel Vetter 2021-09-17 14:50 ` [Intel-gfx] " Daniel Vetter 2021-09-17 12:34 ` [PATCH 08/26] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 09/26] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 10/26] drm/msm: use new iterator in msm_gem_describe Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 11/26] drm/radeon: use new iterator in radeon_sync_resv Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 12/26] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:52 ` Daniel Vetter 2021-09-17 14:52 ` [Intel-gfx] " Daniel Vetter 2021-11-15 14:03 ` Sascha Hauer 2021-11-15 14:03 ` Sascha Hauer 2021-11-15 14:03 ` [Intel-gfx] " Sascha Hauer 2021-11-15 14:08 ` Daniel Vetter 2021-11-15 14:08 ` [Intel-gfx] " Daniel Vetter 2021-11-15 14:08 ` Daniel Vetter 2021-11-15 20:32 ` Christian König 2021-11-15 20:32 ` Christian König 2021-11-15 20:32 ` [Intel-gfx] " Christian König 2021-11-16 7:56 ` Sascha Hauer 2021-11-16 7:56 ` [Intel-gfx] " Sascha Hauer 2021-11-16 7:56 ` Sascha Hauer 2021-09-17 12:35 ` [PATCH 13/26] drm/i915: use the new iterator in i915_gem_busy_ioctl Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-20 8:45 ` Tvrtko Ursulin 2021-09-20 10:13 ` Christian König 2021-09-20 10:33 ` Tvrtko Ursulin 2021-09-21 9:41 ` Christian König 2021-09-21 13:10 ` Tvrtko Ursulin 2021-09-17 12:35 ` [PATCH 14/26] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-20 8:45 ` Tvrtko Ursulin 2021-09-20 8:47 ` Tvrtko Ursulin 2021-09-20 10:14 ` Christian König 2021-09-17 12:35 ` [PATCH 15/26] drm/i915: use the new iterator in i915_request_await_object v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 16/26] drm/i915: use new iterator in i915_gem_object_wait_reservation v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-20 10:00 ` Tvrtko Ursulin 2021-09-21 17:35 ` Christian König 2021-09-17 12:35 ` [PATCH 17/26] drm/i915: use new iterator in i915_gem_object_wait_priority v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 18/26] drm/i915: use new iterator in i915_gem_object_last_write_engine v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 19/26] drm/i915: use new cursor in intel_prepare_plane_fb v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 20/26] drm: use new iterator in drm_gem_fence_array_add_implicit v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 14:53 ` Daniel Vetter 2021-09-17 14:53 ` [Intel-gfx] " Daniel Vetter 2021-09-20 7:31 ` Christian König 2021-09-20 7:31 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 21/26] drm: use new iterator in drm_gem_plane_helper_prepare_fb v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 14:55 ` Daniel Vetter 2021-09-17 14:55 ` [Intel-gfx] " Daniel Vetter 2021-09-20 7:35 ` Christian König 2021-09-20 7:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 22/26] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 23/26] drm/nouveau: use the new interator in nv50_wndw_prepare_fb v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 24/26] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 25/26] drm/etnaviv: replace dma_resv_get_excl_unlocked Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 26/26] dma-buf: nuke dma_resv_get_excl_unlocked Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 14:56 ` Daniel Vetter 2021-09-17 14:56 ` [Intel-gfx] " Daniel Vetter 2021-09-17 14:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/26] dma-buf: add dma_resv_for_each_fence_unlocked v2 Patchwork 2021-09-17 14:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-09-17 15:43 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2021-09-22 9:10 Deploying new iterator interface for dma-buf Christian König 2021-09-22 9:10 ` [PATCH 03/26] dma-buf: use new iterator in dma_resv_copy_fences Christian König 2021-09-21 17:36 [PATCH 01/26] dma-buf: add dma_resv_for_each_fence_unlocked v3 Christian König 2021-09-21 17:36 ` [PATCH 03/26] dma-buf: use new iterator in dma_resv_copy_fences Christian König 2021-09-16 11:30 Deploying new iterator interface for dma-buf Christian König 2021-09-16 11:30 ` [PATCH 03/26] dma-buf: use new iterator in dma_resv_copy_fences Christian König 2021-09-13 13:16 Deploying new iterator interface for dma-buf Christian König 2021-09-13 13:16 ` [PATCH 03/26] dma-buf: use new iterator in dma_resv_copy_fences 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=YUSnqqsMjXOPNB6W@phenom.ffwll.local \ --to=daniel@ffwll.ch \ --cc=ckoenig.leichtzumerken@gmail.com \ --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 \ --subject='Re: [PATCH 03/26] dma-buf: use new iterator in dma_resv_copy_fences' \ /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
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.