Fix race when recycling descriptor sets - #1746
Open
Tyagiquamar wants to merge 1 commit into
Open
Tyagiquamar wants to merge 1 commit into
Tyagiquamar wants to merge 1 commit into
Conversation
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
freeDescriptorSet()publishes a set for reuse before clearing its pool reference. A concurrentallocateDescriptorSet()can restore that reference under the mutex, only for the later clear to erase it. Keep the pool alive explicitly and clear the set's reference while holding the same mutex.Fixes #1745
Type of change
How Has This Been Tested?
vsg_descriptor_pool_recyclewith GCC 12.2 and CMake 3.25.1 in Debian Docker, with windowing and shader compilation disabled.VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/lvp_icd.x86_64.json ctest --test-dir /work-build --output-on-failure -R vsg_descriptor_pool_recycle --repeat until-fail:10passed 10/10 runs.DescriptorPoolaccesses before the fix and noDescriptorPoolrace after it. Two remaining Helgrind contexts are inside Mesa Lavapipe.unexpected memory mapping), so I used Helgrind.clang-format --dry-run --Werrorpassed for the changed C++ lines and test.Test Configuration:
Checklist: