Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpf: small CT cleanups #24686

Merged
merged 3 commits into from Apr 5, 2023

Conversation

julianwiedmann
Copy link
Member

@julianwiedmann julianwiedmann commented Apr 2, 2023

Clarify the semantics of some field in the ct_entry / ct_state struct. Callers of lb_local() re-use the result of the CT_SERVICE lookup (or parts of it), so it's important to understand which fields are relevant and which ones are guaranteed to be 0.

We started to pay more attention to this in #24212, let's now also clean up the backlog of existing fields.

Quite a few fields in the ct_state struct are not relevant to CT entries
created with CT_SERVICE. Ignore them, for both the entry creation and when
returning the result of a CT lookup.

This is mostly a readability improvement, I'm not aware that it's helping
with any complexity troubles.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
lb*_local() always calls ct_create*() with these three parameters set to
`false`. So it's safe to ignore them for CT_SERVICE entries.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
When bpf_lxc does a CT_SERVICE lookup, it propagates the result across the
subsequent tail-call with lb*_ctx_store_state() and restores it afterwards
for use by the ct_create(..., CT_EGRESS) call.

This currently propagates the backend_id (as returned by the CT_SERVICE
lookup). As ct_create*(..., CT_EGRESS) ignores ct_state->backend_id, this
isn't necessary.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann julianwiedmann added sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/misc This PR makes changes that have no direct user impact. labels Apr 2, 2023
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann
Copy link
Member Author

opened #24687 for the 1.26-net-next fail, re-running.

@julianwiedmann
Copy link
Member Author

/test-1.26-net-next

@julianwiedmann julianwiedmann changed the title WIP bpf: CT cleanups bpf: small CT cleanups Apr 3, 2023
@julianwiedmann julianwiedmann marked this pull request as ready for review April 3, 2023 06:17
@julianwiedmann julianwiedmann requested a review from a team as a code owner April 3, 2023 06:17
@julianwiedmann
Copy link
Member Author

@YutaroHayakawa hoping you still have some context on this 🙂

Copy link
Member

@YutaroHayakawa YutaroHayakawa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@julianwiedmann julianwiedmann added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 5, 2023
@julianwiedmann julianwiedmann merged commit 8c34c62 into cilium:master Apr 5, 2023
58 checks passed
@julianwiedmann julianwiedmann deleted the 1.14-ct-cleanups-v2 branch April 5, 2023 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants