CVPN-2519: Expresslane and InsidePktCodec mutually exclusive#412
Open
kp-weiwen-goh wants to merge 4 commits into
Open
CVPN-2519: Expresslane and InsidePktCodec mutually exclusive#412kp-weiwen-goh wants to merge 4 commits into
kp-weiwen-goh wants to merge 4 commits into
Conversation
|
Code coverage summary for f20a316: ✅ Region coverage 69% passes |
kp-weiwen-goh
force-pushed
the
expresslane-insidepktcodec-mutex
branch
2 times, most recently
from
e06fd74 to
e26ecea
Compare
kp-weiwen-goh
force-pushed
the
expresslane-insidepktcodec-mutex
branch
from
e26ecea to
ad00391
Compare
kp-antonio-yang
requested changes
May 18, 2026
Comment on lines
1696
to
+1712
| if self.expresslane.state == new_state { | ||
| return; | ||
| } | ||
| if new_state == ExpresslaneState::Active | ||
| && self.data_path_mode == DataPathMode::InsidePktCodec | ||
| { | ||
| warn!("Blocking expresslane activation: InsidePktCodec is active"); | ||
| return; | ||
| } | ||
| self.expresslane.state = new_state; | ||
| self.event(Event::ExpresslaneStateChanged(new_state)); | ||
|
|
||
| if new_state == ExpresslaneState::Active { | ||
| self.set_data_path_mode(DataPathMode::ExpressLane); | ||
| } else if self.data_path_mode == DataPathMode::ExpressLane { | ||
| self.set_data_path_mode(DataPathMode::Standard); | ||
| } |
Contributor
There was a problem hiding this comment.
May we use match here, such that compiler can help us to go through each state, and also future proof, when a new state comes in.
match (new_state, self.data_path_mode) {
(_, _) if self.expresslane.state == new_state => return,
(ExpresslaneState::Active, DataPathMode::InsidePktCodec) => {
warn!("Blocking expresslane activation: InsidePktCodec is active");
return;
}
(ExpresslaneState::Active, ) => {
self.set_data_path_mode(DataPathMode::ExpressLane);
}
(, DataPathMode::ExpressLane) => {
self.set_data_path_mode(DataPathMode::Standard);
}
(ExpresslaneState::Disabled, _)
| (ExpresslaneState::WaitingForClient, _)
| (ExpresslaneState::Inactive, _)
| (ExpresslaneState::Degraded, _) => {}
}
self.expresslane.state = new_state;
self.event(Event::ExpresslaneStateChanged(new_state));
Contributor
Author
There was a problem hiding this comment.
I replaced the second branch with a match, but kept the first check to maintain the same order (set new state and emit event, then set data path).
This way, if there is a new state, it will cause a compile error.
Contributor
There was a problem hiding this comment.
Yeh, that is what I means, If there is a new state, then compile error, and developer will take a look on the function, and make sure the logic is correct. Do agree with this?
kp-weiwen-goh
force-pushed
the
expresslane-insidepktcodec-mutex
branch
from
ad00391 to
ca0e94c
Compare
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 7 days if no further activity occurs. |
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
2 participants
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
Adds a
DataPathModeenum that enforces that ExpressLane and InsidePktCodec are never both enabled.ExpressLane cannot be enabled if
DataPathModeisInsidePktCodec.If ExpressLane is enabled when an encoding request is sent or received, ExpressLane is set to
Inactiveand is only re-enabled when encoding is then disabled.Motivation and Context
They are mutually exclusive. Previously, this was not enforced by code and relies on correct user configuration.
How Has This Been Tested?
Types of changes
Checklist:
main