mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-27 04:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

venus: fix a race condition between gem close and gem handle tracking

Browse Source 
After using sparse array to manager virtgpu bo, we set gem_handle to 0
to indicate that the bo is invalid. However, the gem handle gets closed
before that and can be reused by another newly created bo, leading to
the tracked gem handle being unexpectedly zero'ed out.

Fixes: 88f481dd74 ("venus: make sure gem_handle and vn_renderer_bo are 1:1")
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30362>
This commit is contained in:
Yiwei Zhang 2024-07-24 22:17:00 -07:00 committed by Marge Bot
parent 23b0798551
commit f788c87d02
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/virtio/vulkan/vn_renderer_virtgpu.c
View File

@ -1111,10 +1111,15 @@ virtgpu_bo_destroy(struct vn_renderer *renderer, struct vn_renderer_bo *_bo)
if (bo->base.mmap_ptr)
munmap(bo->base.mmap_ptr, bo->base.mmap_size);
virtgpu_ioctl_gem_close(gpu, bo->gem_handle);
/* set gem_handle to 0 to indicate that the bo is invalid */
/* Set gem_handle to 0 to indicate that the bo is invalid. Must be set
* before closing gem handle. Otherwise the same gem handle can be reused
* by another newly created bo and unexpectedly gotten zero'ed out the
* tracked gem handle.
*/
const uint32_t gem_handle = bo->gem_handle;
bo->gem_handle = 0;
virtgpu_ioctl_gem_close(gpu, gem_handle);
mtx_unlock(&gpu->dma_buf_import_mutex);