Fix concurrent map read/write race condition after importing CNP #24032
Conversation
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
|
Closing and reopening to retrigger the tests, since they failed due to an error while building the images, caused by DockerHub connectivity issues: |
A crash of the agent can occur when processing a newly imported CiliumNetworkPolicy, if the idCache map is accessed without a lock during a concurrent write. This fix adds the acquisition of a read lock to guard that operation. Fixes: c9f0def ("policy: Fix Deny Precedence Bug") Fixes: cilium#24021 Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
250850f to
df15365
Compare
christarazi
reviewed
Mar 10, 2023
Comment on lines
-201
to
-202
| p.selectorPolicy.SelectorCache.mutex.Lock() | ||
| defer p.selectorPolicy.SelectorCache.mutex.Unlock() |
There was a problem hiding this comment.
I don't think this can be done. It will introduce race conditions with concurrent identity updates as the removed comments states. ConsumeMapChanges doesn't have an explicit dependency on the SelectorCache, but it's implicit. I can understand why someone might think that these statements can be removed.
There was a problem hiding this comment.
That was my doubt too. It wasn't clear to me whether it was still necessary after the rework, since there seemed to be no explicitly dependency. Thanks for the clarification
|
Superseded by #24322 |
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.
A crash of the agent can occur when processing a newly imported CiliumNetworkPolicy, if the idCache map is accessed without a lock during a concurrent write. This fix adds the acquisition of a read lock to guard that operation.
No backport is required, since it affects only master.
Fixes: #24021