From: Bruce Cherniak Date: Sat, 1 Jul 2017 03:24:46 +0000 (-0500) Subject: swr: Limit memory held by defer deleted resources. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32c1a54bd01465e77a8e26b9cc8d2487b31509c5;p=mesa.git swr: Limit memory held by defer deleted resources. 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" Reviewed-by: Ilia Mirkin --- diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp index b7f06c07192..53b5dadec9f 100644 --- a/src/gallium/drivers/swr/swr_screen.cpp +++ b/src/gallium/drivers/swr/swr_screen.cpp @@ -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);