fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tu: Fix zombie VMAs array not initialized when first BOs may be freed

Browse source 
First BOs were allocated before zombie_vmas was initialized so on
failure their clean up paths used uninitialized zombie_vmas.

Fixes
 dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic
 dEQP-VK.api.object_management.alloc_callback_fail.device_group

See https://gitlab.freedesktop.org/mesa/mesa/-/issues/9247

Fixes: 63904240f2
("tu: Re-enable bufferDeviceAddressCaptureReplay")

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24086>
This commit is contained in:
Danylo Piliaiev 2023-07-11 12:13:08 +02:00 • committed by Marge Bot
parent 8e383e6d9e
commit 99e58460ef
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/freedreno/vulkan/tu_device.cc
View file

@ -2109,6 +2109,17 @@ tu_CreateDevice(VkPhysicalDevice physicalDevice,
/* Initialize sparse array for refcounting imported BOs */ /* Initialize sparse array for refcounting imported BOs */
util_sparse_array_init(&device->bo_map, sizeof(struct tu_bo), 512); util_sparse_array_init(&device->bo_map, sizeof(struct tu_bo), 512);
if (physical_device->has_set_iova) {
STATIC_ASSERT(TU_MAX_QUEUE_FAMILIES == 1);
if (!u_vector_init(&device->zombie_vmas, 64,
sizeof(struct tu_zombie_vma))) {
result = vk_startup_errorf(physical_device->instance,
VK_ERROR_INITIALIZATION_FAILED,
"zombie_vmas create failed");
goto fail_free_zombie_vma;
}
}
/* initial sizes, these will increase if there is overflow */ /* initial sizes, these will increase if there is overflow */
device->vsc_draw_strm_pitch = 0x1000 + VSC_PAD; device->vsc_draw_strm_pitch = 0x1000 + VSC_PAD;
device->vsc_prim_strm_pitch = 0x4000 + VSC_PAD; device->vsc_prim_strm_pitch = 0x4000 + VSC_PAD;
@ -2242,17 +2253,6 @@ tu_CreateDevice(VkPhysicalDevice physicalDevice,
goto fail_timeline_cond; goto fail_timeline_cond;
} }
if (physical_device->has_set_iova) {
STATIC_ASSERT(TU_MAX_QUEUE_FAMILIES == 1);
if (!u_vector_init(&device->zombie_vmas, 64,
sizeof(struct tu_zombie_vma))) {
result = vk_startup_errorf(physical_device->instance,
VK_ERROR_INITIALIZATION_FAILED,
"zombie_vmas create failed");
goto fail_free_zombie_vma;
}
}
for (unsigned i = 0; i < ARRAY_SIZE(device->scratch_bos); i++) for (unsigned i = 0; i < ARRAY_SIZE(device->scratch_bos); i++)
mtx_init(&device->scratch_bos[i].construct_mtx, mtx_plain); mtx_init(&device->scratch_bos[i].construct_mtx, mtx_plain);
@ -2280,8 +2280,6 @@ tu_CreateDevice(VkPhysicalDevice physicalDevice,
*pDevice = tu_device_to_handle(device); *pDevice = tu_device_to_handle(device);
return VK_SUCCESS; return VK_SUCCESS;
fail_free_zombie_vma:
u_vector_finish(&device->zombie_vmas);
fail_timeline_cond: fail_timeline_cond:
fail_prepare_perfcntrs_pass_cs: fail_prepare_perfcntrs_pass_cs:
free(device->perfcntrs_pass_cs_entries); free(device->perfcntrs_pass_cs_entries);
@ -2302,7 +2300,8 @@ fail_global_bo:
util_sparse_array_finish(&device->bo_map); util_sparse_array_finish(&device->bo_map);
if (physical_device->has_set_iova) if (physical_device->has_set_iova)
util_vma_heap_finish(&device->vma); util_vma_heap_finish(&device->vma);
fail_free_zombie_vma:
u_vector_finish(&device->zombie_vmas);
fail_queues: fail_queues:
for (unsigned i = 0; i < TU_MAX_QUEUE_FAMILIES; i++) { for (unsigned i = 0; i < TU_MAX_QUEUE_FAMILIES; i++) {
for (unsigned q = 0; q < device->queue_count[i]; q++) for (unsigned q = 0; q < device->queue_count[i]; q++)