]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
dma-fence: Avoid list_del during fence->cb_list iteration
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 17 Aug 2019 14:47:34 +0000 (15:47 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Sat, 17 Aug 2019 17:03:00 +0000 (18:03 +0100)
Before we notify the fence signal callback, we remove the cb from the
list. However, since we are processing the entire list from underneath
the spinlock, we do not need to individual delete each element, but can
simply reset the link and the entire list.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Christian König <christian.koenig@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190817144736.7826-4-chris@chris-wilson.co.uk
drivers/dma-buf/dma-fence.c

index 8025a891d3e9e254780bdff811150daa64b51454..ff0cd6eae766dd634dd44d0d8cd75181d7e16549 100644 (file)
@@ -149,9 +149,12 @@ int dma_fence_signal_locked(struct dma_fence *fence)
                trace_dma_fence_signaled(fence);
        }
 
-       list_for_each_entry_safe(cur, tmp, &fence->cb_list, node) {
-               list_del_init(&cur->node);
-               cur->func(fence, cur);
+       if (!list_empty(&fence->cb_list)) {
+               list_for_each_entry_safe(cur, tmp, &fence->cb_list, node) {
+                       INIT_LIST_HEAD(&cur->node);
+                       cur->func(fence, cur);
+               }
+               INIT_LIST_HEAD(&fence->cb_list);
        }
        return ret;
 }