From ec53c72f58a4cb99d91b45930fd48ebc12d88cc2 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 26 Nov 2020 16:37:01 +0200 Subject: [PATCH] anv: fix descriptor pool leak in VMA object Quoting the spec : "When a pool is destroyed, all descriptor sets allocated from the pool are implicitly freed and become invalid. Descriptor sets allocated from a given pool do not need to be freed before destroying that descriptor pool." This implies we might leak nodes allocated in the vma object. Signed-off-by: Lionel Landwerlin Fixes: 0a6d2593b8b63d ("anv: Allocate descriptor buffers from the BO cache") Reviewed-by: Jason Ekstrand Part-of: (cherry picked from commit 5d55ca9c300a6e240cf9216bba203321b7b44c90) --- .pick_status.json | 2 +- src/intel/vulkan/anv_descriptor_set.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e7f157e400c..6afc7a19bb4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1912,7 +1912,7 @@ "description": "anv: fix descriptor pool leak in VMA object", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "0a6d2593b8b63d2429e79eed900848c5c9a522c9" }, diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c index 961d5c2ad52..2163d433b80 100644 --- a/src/intel/vulkan/anv_descriptor_set.c +++ b/src/intel/vulkan/anv_descriptor_set.c @@ -800,8 +800,10 @@ void anv_DestroyDescriptorPool( anv_descriptor_set_layout_unref(device, set->layout); } - if (pool->bo) + if (pool->bo) { + util_vma_heap_finish(&pool->bo_heap); anv_device_release_bo(device, pool->bo); + } anv_state_stream_finish(&pool->surface_state_stream); vk_object_base_finish(&pool->base);