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

[v1.14] bpf: EgressGW-related tracing improvements #27524

Merged
merged 3 commits into from Aug 21, 2023

Conversation

julianwiedmann
Copy link
Member

@julianwiedmann julianwiedmann commented Aug 16, 2023

Manual backport (due to complexity troubles and smaller contextual conflicts) of

Once this PR is merged, you can update the PR labels via:

for pr in 27079 27178 27218; do contrib/backporting/set-labels.py $pr done 1.14; done

or with

make add-labels BRANCH=v1.14 ISSUES=27079,27178,27218

@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Aug 16, 2023
@julianwiedmann
Copy link
Member Author

/test-backport-1.14

@julianwiedmann
Copy link
Member Author

/test-backport-1.14

@julianwiedmann
Copy link
Member Author

/test-backport-1.14

@julianwiedmann
Copy link
Member Author

/test-backport-1.14

@julianwiedmann
Copy link
Member Author

/ci-verifier

@julianwiedmann
Copy link
Member Author

/ci-verifier

@julianwiedmann
Copy link
Member Author

/ci-verifier

[ upstream commit 93c8884 ]

[ backporter's note:
  Looks a bit different, as the v1.14-stable branch doesn't have the SNAT
  split from cilium#26674. ]

Right now this is decided at the lowest level of the SNAT path. But
actually the callers know much better. In particular this avoids one case
where we bake EgressGW knowledge deep into the SNAT code.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
[ upstream commit 3796d0d ]

When the NAT code creates a CT entry for a SNATed connection (for instance
for EgressGW traffic), pass back the resulting trace information to
tail_handle_snat_fwd_ipv*().

Note that this also wires up the path from tail_nodeport_nat_egress_ipv*(),
but those connections never require CT on the NAT level.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
[ upstream commit f4098db ]

When redirecting EgressGW replies to the tunnel interface, we don't have a
CT lookup to determine the trace reason. But we still know it's a reply, so
we can set the reason manually.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
Copy link
Member Author

/test-backport-1.14

@julianwiedmann
Copy link
Member Author

Needed a backport of #27079 to reduce stack size :/.

@julianwiedmann julianwiedmann marked this pull request as ready for review August 18, 2023 09:00
@julianwiedmann julianwiedmann requested a review from a team as a code owner August 18, 2023 09:00
@julianwiedmann julianwiedmann added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 21, 2023
Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

Acking, given the authorship and previous review I assume that this has been double-checked by folks with more context than I have :)

@joestringer joestringer merged commit 8d6294f into cilium:v1.14 Aug 21, 2023
56 checks passed
@julianwiedmann julianwiedmann deleted the v1.14-bpf-tracing branch August 21, 2023 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants