From 5e97150e21a75920c3521717f70f9f92702729b4 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Thu, 3 Nov 2022 11:28:12 +0100 Subject: [PATCH] v3dv: do better cleanup on failure during pipeline cache operation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes (with disk cache enabled): dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic dEQP-VK.api.object_management.alloc_callback_fail.device dEQP-VK.api.object_management.alloc_callback_fail.device_group Reviewed-by: Alejandro Piñeiro Reviewed-by: Eric Engestrom cc: mesa-stable Part-of: --- src/broadcom/vulkan/v3dv_pipeline_cache.c | 38 ++++++++++++++++------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_pipeline_cache.c b/src/broadcom/vulkan/v3dv_pipeline_cache.c index 44a64d02b87..9e0470aeaa7 100644 --- a/src/broadcom/vulkan/v3dv_pipeline_cache.c +++ b/src/broadcom/vulkan/v3dv_pipeline_cache.c @@ -402,15 +402,13 @@ v3dv_pipeline_shared_data_new(struct v3dv_pipeline_cache *cache, "pipeline shader assembly", true); if (!bo) { fprintf(stderr, "failed to allocate memory for shaders assembly\n"); - v3dv_pipeline_shared_data_unref(cache->device, new_entry); - return NULL; + goto fail; } bool ok = v3dv_bo_map(cache->device, bo, total_assembly_size); if (!ok) { fprintf(stderr, "failed to map source shader buffer\n"); - v3dv_pipeline_shared_data_unref(cache->device, new_entry); - return NULL; + goto fail; } memcpy(bo->map, total_assembly, total_assembly_size); @@ -418,6 +416,10 @@ v3dv_pipeline_shared_data_new(struct v3dv_pipeline_cache *cache, new_entry->assembly_bo = bo; return new_entry; + +fail: + v3dv_pipeline_shared_data_unref(cache->device, new_entry); + return NULL; } static void @@ -576,6 +578,7 @@ v3dv_pipeline_shared_data_create_from_blob(struct v3dv_pipeline_cache *cache, const unsigned char *sha1_key = blob_read_bytes(blob, 20); struct v3dv_descriptor_maps *maps[BROADCOM_SHADER_STAGES] = { 0 }; + struct v3dv_shader_variant *variants[BROADCOM_SHADER_STAGES] = { 0 }; uint8_t descriptor_maps_count = blob_read_uint8(blob); for (uint8_t count = 0; count < descriptor_maps_count; count++) { @@ -585,14 +588,14 @@ v3dv_pipeline_shared_data_create_from_blob(struct v3dv_pipeline_cache *cache, blob_read_bytes(blob, sizeof(struct v3dv_descriptor_maps)); if (blob->overrun) - return NULL; + goto fail; maps[stage] = vk_zalloc2(&cache->device->vk.alloc, NULL, sizeof(struct v3dv_descriptor_maps), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (maps[stage] == NULL) - return NULL; + goto fail; memcpy(maps[stage], current_maps, sizeof(struct v3dv_descriptor_maps)); if (broadcom_shader_stage_is_render_with_binning(stage)) { @@ -604,8 +607,6 @@ v3dv_pipeline_shared_data_create_from_blob(struct v3dv_pipeline_cache *cache, uint8_t variant_count = blob_read_uint8(blob); - struct v3dv_shader_variant *variants[BROADCOM_SHADER_STAGES] = { 0 }; - for (uint8_t count = 0; count < variant_count; count++) { uint8_t stage = blob_read_uint8(blob); struct v3dv_shader_variant *variant = @@ -618,10 +619,25 @@ v3dv_pipeline_shared_data_create_from_blob(struct v3dv_pipeline_cache *cache, blob_read_bytes(blob, total_assembly_size); if (blob->overrun) - return NULL; + goto fail; - return v3dv_pipeline_shared_data_new(cache, sha1_key, maps, variants, - total_assembly, total_assembly_size); + struct v3dv_pipeline_shared_data *data = + v3dv_pipeline_shared_data_new(cache, sha1_key, maps, variants, + total_assembly, total_assembly_size); + + if (!data) + goto fail; + + return data; + +fail: + for (int i = 0; i < BROADCOM_SHADER_STAGES; i++) { + if (maps[i]) + vk_free2(&cache->device->vk.alloc, NULL, maps[i]); + if (variants[i]) + v3dv_shader_variant_destroy(cache->device, variants[i]); + } + return NULL; } static void