KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v3dv/pipeline_cache: bail out in case of error 

Currently, in GetPipelineCacheData() function, in several cases if
there is an error the blob is finished and cache unlocked, but code
continues executing, which can lead to multiple
`pthread_mutex_unlock()` calls.

Instead, if there's an error just bail out to finish the blob and unlock
the cache directly.

Fixes CID#1468147 "Double unlock (LOCK)".

v2:
 - Rename "bail_out" by "done" (apinheiro)

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10404>
This commit is contained in:
Juan A. Suarez Romero 2021-04-22 10:43:13 +02:00
parent dc736a1740
commit c93bd731f8
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/broadcom/vulkan/v3dv_pipeline_cache.c
View File

@ -913,7 +913,7 @@ v3dv_GetPipelineCacheData(VkDevice _device,
}
struct v3dv_physical_device *pdevice = &device->instance->physicalDevice;
VkResult result = VK_SUCCESS;
VkResult result = VK_INCOMPLETE;
pthread_mutex_lock(&cache->mutex);
@ -930,9 +930,7 @@ v3dv_GetPipelineCacheData(VkDevice _device,
intptr_t nir_count_offset = blob_reserve_uint32(&blob);
if (nir_count_offset < 0) {
*pDataSize = 0;
blob_finish(&blob);
pthread_mutex_unlock(&cache->mutex);
return VK_INCOMPLETE;
goto done;
}
if (cache->nir_cache) {
@ -947,9 +945,7 @@ v3dv_GetPipelineCacheData(VkDevice _device,
if (blob.out_of_memory) {
blob.size = save_size;
pthread_mutex_unlock(&cache->mutex);
result = VK_INCOMPLETE;
break;
goto done;
}
nir_count++;
@ -961,9 +957,7 @@ v3dv_GetPipelineCacheData(VkDevice _device,
intptr_t count_offset = blob_reserve_uint32(&blob);
if (count_offset < 0) {
*pDataSize = 0;
blob_finish(&blob);
pthread_mutex_unlock(&cache->mutex);
return VK_INCOMPLETE;
goto done;
}
if (cache->cache) {
@ -974,9 +968,7 @@ v3dv_GetPipelineCacheData(VkDevice _device,
if (!v3dv_pipeline_shared_data_write_to_blob(cache_entry, &blob)) {
/* If it fails reset to the previous size and bail */
blob.size = save_size;
pthread_mutex_unlock(&cache->mutex);
result = VK_INCOMPLETE;
break;
goto done;
}
count++;
@ -987,7 +979,7 @@ v3dv_GetPipelineCacheData(VkDevice _device,
*pDataSize = blob.size;
blob_finish(&blob);
result = VK_SUCCESS;
if (debug_cache) {
assert(count <= cache->stats.count);
@ -997,6 +989,9 @@ v3dv_GetPipelineCacheData(VkDevice _device,
cache, nir_count, count, (uint32_t) *pDataSize);
}
done:
blob_finish(&blob);
pthread_mutex_unlock(&cache->mutex);
return result;