dma-buf: use new iterator in dma_resv_test_signaled

This makes the function much simpler since the complex
retry logic is now handled elsewhere.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211005113742.1101-8-christian.koenig@amd.com

diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index 61efa557dcf31578313768fa911255f80164b52e..a480af9581bd13b66314665254809252896c2548 100644 (file)
--- a/drivers/dma-buf/dma-resv.c
+++ b/drivers/dma-buf/dma-resv.c
@@ -584,22 +584,6 @@ long dma_resv_wait_timeout(struct dma_resv *obj, bool wait_all, bool intr,
 EXPORT_SYMBOL_GPL(dma_resv_wait_timeout);
 
 
-static inline int dma_resv_test_signaled_single(struct dma_fence *passed_fence)
-{
-       struct dma_fence *fence, *lfence = passed_fence;
-       int ret = 1;
-
-       if (!test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &lfence->flags)) {
-               fence = dma_fence_get_rcu(lfence);
-               if (!fence)
-                       return -1;
-
-               ret = !!dma_fence_is_signaled(fence);
-               dma_fence_put(fence);
-       }
-       return ret;
-}
-
 /**
  * dma_resv_test_signaled - Test if a reservation object's fences have been
  * signaled.
@@ -616,43 +600,16 @@ static inline int dma_resv_test_signaled_single(struct dma_fence *passed_fence)
  */
 bool dma_resv_test_signaled(struct dma_resv *obj, bool test_all)
 {
+       struct dma_resv_iter cursor;
        struct dma_fence *fence;
-       unsigned int seq;
-       int ret;
-
-       rcu_read_lock();
-retry:
-       ret = true;
-       seq = read_seqcount_begin(&obj->seq);
-
-       if (test_all) {
-               struct dma_resv_list *fobj = dma_resv_shared_list(obj);
-               unsigned int i, shared_count;
-
-               shared_count = fobj ? fobj->shared_count : 0;
-               for (i = 0; i < shared_count; ++i) {
-                       fence = rcu_dereference(fobj->shared[i]);
-                       ret = dma_resv_test_signaled_single(fence);
-                       if (ret < 0)
-                               goto retry;
-                       else if (!ret)
-                               break;
-               }
-       }
-
-       fence = dma_resv_excl_fence(obj);
-       if (ret && fence) {
-               ret = dma_resv_test_signaled_single(fence);
-               if (ret < 0)
-                       goto retry;
 
+       dma_resv_iter_begin(&cursor, obj, test_all);
+       dma_resv_for_each_fence_unlocked(&cursor, fence) {
+               dma_resv_iter_end(&cursor);
+               return false;
        }
-
-       if (read_seqcount_retry(&obj->seq, seq))
-               goto retry;
-
-       rcu_read_unlock();
-       return ret;
+       dma_resv_iter_end(&cursor);
+       return true;
 }
 EXPORT_SYMBOL_GPL(dma_resv_test_signaled);