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.

Sign up for GitHub

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

Jump to bottom

bpf: lb: small cleanups #24320

Merged
merged 3 commits into from Mar 13, 2023
Merged

bpf: lb: small cleanups #24320

merged 3 commits into from Mar 13, 2023

Conversation

julianwiedmann
Copy link
Member

@julianwiedmann julianwiedmann commented Mar 12, 2023 •
edited

Clean up a few parameters in the lb_local() code flow, so that it's easier accessible to the casual reader.

@julianwiedmann
bpf: lb: don't pass ip4->saddr to lb4_local()
80c0440 
Instead of passing in the saddr, just get it from the CT tuple. This
matches lb6_local(), and avoids one of the many function parameters.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
bpf: lb: don't pass daddr to lb*_xlate()
a7f1870 
Instead of passing the backend address as an extra pointer, just take it
from the backend struct. This wasn't possibly previously, as we couldn't
copy from a map value on a 4.9 kernel.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
bpf: lb: push down csum_off into lb*_xlate()
3be45ca 
The csum_offset struct is only needed when re-writing a packet for DNAT to
the backend. Push it down into the relevant code.

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. kind/cleanup This includes no functional changes. release-note/misc This PR makes changes that have no direct user impact. labels Mar 12, 2023
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann julianwiedmann changed the title WIP bpf: lb: small cleanups Mar 13, 2023
@julianwiedmann julianwiedmann marked this pull request as ready for review March 13, 2023 06:57
@julianwiedmann julianwiedmann requested a review from a team as a code owner March 13, 2023 06:57
@julianwiedmann julianwiedmann added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 13, 2023
@borkmann borkmann merged commit 1574e2d into cilium:master Mar 13, 2023
@julianwiedmann julianwiedmann deleted the 1.14-bpf-lb-cleanups-2 branch March 13, 2023 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@borkmann borkmann borkmann approved these changes

@jibi jibi Awaiting requested review from jibi jibi was automatically assigned from cilium/sig-datapath

Assignees
No one assigned
Labels
kind/cleanup This includes no functional changes. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@julianwiedmann @borkmann