bpf: Remove dead code for consistency between IPv4/v6 #24008
Merged
Conversation
This file contains 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
In resolve_srcid_ipv6(), we check that src_id is equal to WORLD_ID before updating it's value. That was in case derive_src_id() changed its value. Since commit 32a921a ("bpf: Remove flowlabel optimization for identity") removed the call to derive_src_id(), src_id will now always be equal to WORLD_ID. Let's remove that check to be consistent with the sibling function resolve_srcid_ipv4(). Reported-by: Joe Stringer <joe@cilium.io> Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
added
sig/datapath
borkmann
approved these changes
Feb 24, 2023
|
/test Job 'Cilium-PR-K8s-1.25-kernel-4.19' failed: Click to show.Test NameFailure OutputIf it is a flake and a GitHub issue doesn't already exist to track it, comment |
YutaroHayakawa
approved these changes
Feb 24, 2023
|
k8s-1.25-kernel-4.19 failed with known flake #15455. Other CI jobs are passing, reviews are in, marking ready to merge. |
pchaigno
added
the
ready-to-merge
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.
In
resolve_srcid_ipv6(), we check thatsrc_idis equal toWORLD_IDbefore updating it's value. That was in casederive_src_id()changed its value.Given commit 32a921a ("bpf: Remove flowlabel optimization for identity") removed the call to
derive_src_id(),src_idwill now always be equal toWORLD_ID. Let's remove that check to be consistent with the sibling functionresolve_srcid_ipv4().