From ed75400a5099f930343f0055f7b6d17d7ddd6619 Mon Sep 17 00:00:00 2001 From: Ryan Neph Date: Wed, 17 Jan 2024 13:10:23 -0800 Subject: [PATCH] venus: fix shmem leak on vn_ring_destroy Missed shmem unref when moving ring internals out of vn_instance.c. Fixes: d1e29b75578 ("venus: move ring shmem into vn_ring") Signed-off-by: Ryan Neph Part-of: (cherry picked from commit 6e4bb8253ed36f911a0a45dfecf89c237a8cd362) --- .pick_status.json | 2 +- src/virtio/vulkan/vn_ring.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index d7bdd147a93..7bbcb54a3e2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -124,7 +124,7 @@ "description": "venus: fix shmem leak on vn_ring_destroy", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d1e29b7557877c9b278593b8f0c7e6c531849f23", "notes": null diff --git a/src/virtio/vulkan/vn_ring.c b/src/virtio/vulkan/vn_ring.c index 461e97b7c4e..085a24f1551 100644 --- a/src/virtio/vulkan/vn_ring.c +++ b/src/virtio/vulkan/vn_ring.c @@ -346,6 +346,7 @@ vn_ring_destroy(struct vn_ring *ring) vk_free(alloc, submit); vn_cs_encoder_fini(&ring->upload); + vn_renderer_shmem_unref(ring->instance->renderer, ring->shmem); mtx_destroy(&ring->mutex);