commit bf76f2b21c18c1e4a5caf9d5b3ed760da696c436
author Lionel Landwerlin <lionel.g.landwerlin@intel.com> Thu Nov 26 16:37:01 2020 +0200
committer Dylan Baker <dylan.c.baker@intel.com> Tue Dec 01 09:12:35 2020 -0800
tree f7910f015faa80a1420bde46e99702d40f5813fb
parent 099804865ad08e0689e965a19ebdd2d4a2e9f64a

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 <lionel.g.landwerlin@intel.com>
Fixes: 0a6d2593b8b63d ("anv: Allocate descriptor buffers from the BO cache")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7796>
(cherry picked from commit 5d55ca9c300a6e240cf9216bba203321b7b44c90)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 82e4bdc..b10cdf3 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"
     },

src/intel/vulkan/anv_descriptor_set.c

diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c
index a0a4540..e3895a7 100644
--- a/src/intel/vulkan/anv_descriptor_set.c
+++ b/src/intel/vulkan/anv_descriptor_set.c
@@ -909,8 +909,10 @@
       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);