swr: Limit memory held by defer deleted resources.
authorBruce Cherniak <bruce.cherniak@intel.com>
Sat, 1 Jul 2017 03:24:46 +0000 (22:24 -0500)
committerTim Rowley <timothy.o.rowley@intel.com>
Sun, 2 Jul 2017 22:38:57 +0000 (17:38 -0500)
This patch limits the number of items on the fence work queue (the
deferred deletion list) by submitting a sync fence when the queue size
exceeds a threshold.  This initiates deferred deletion of all resources
on the list and decreases the total amount of memory held waiting for
"deferred deletion".

This resolves  bug 101467 filed against swr for the piglit
streaming-texture-leak test.  For those running on smaller memory
(16GB?) systems, this will prevent oom-killer.

Thus far, we have not seen any real world applications that exhibit
behavior like the streaming-texture-leak test; as any form of pipeline
flush will trigger the defer queue and properly free any retained
allocations.  But, this addresses those as well.

Cc: "17.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
src/gallium/drivers/swr/swr_screen.cpp

index b7f06c07192a8e7f3c17fcecf1b3d4344024f9a3..53b5dadec9f396a66c242c0660f272f10727e734 100644 (file)
@@ -992,6 +992,12 @@ swr_resource_destroy(struct pipe_screen *p_screen, struct pipe_resource *pt)
       swr_fence_work_free(screen->flush_fence, spr->swr.pBaseAddress, true);
       swr_fence_work_free(screen->flush_fence,
                           spr->secondary.pBaseAddress, true);
+
+      /* If work queue grows too large, submit a fence to force queue to
+       * drain.  This is mainly to decrease the amount of memory used by the
+       * piglit streaming-texture-leak test */
+      if (screen->pipe && swr_fence(screen->flush_fence)->work.count > 64)
+         swr_fence_submit(swr_context(screen->pipe), screen->flush_fence);
    }
 
    FREE(spr);