Handle EINVAL when enabling VLAN filtering on Linux 6.12#5304
Merged
Conversation
On Linux 6.12, attempting to enable VLAN filtering on a bridge that is not yet ready may return EINVAL instead of EBUSY. Update VLANBridgeConfigurator to treat both EBUSY and EINVAL as indications that the bridge is busy, ensuring proper retry behavior. Note that the code retries for up to 1 minute. If EINVAL occurs due to an actual invalid argument, the error will eventually be returned instead of looping indefinitely. Signed-off-by: Milan Lenco <[email protected]>
rene
reviewed
Oct 14, 2025
rene
left a comment
Contributor
There was a problem hiding this comment.
LGTM as well (will not approve again because it's approved already and Eden tests are running)...
Contributor
Author
|
I run the LPS/LOC test suite locally and it passes fine. |
7 tasks
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
On Linux 6.12, attempting to enable VLAN filtering on a bridge that is not yet ready may return
EINVALinstead ofEBUSY. UpdateVLANBridgeConfiguratorto treat bothEBUSYandEINVALas indications that the bridge is busy, ensuring proper retry behavior.Note that the code retries for up to 1 minute. If
EINVALoccurs due to an actual invalid argument, the error will eventually be returned instead of looping indefinitely.How to test and validate this PR
Example (for a Switch NI attached to eth0):
Changelog notes
Support VLAN filtering on Linux 6.12
PR Backports
Only needed for Linux kernel 6.12, which is yet to be merged into master.
Not to be backported to already released LTS versions.
Checklist