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.13] bpf: nat: report detailed error from map_update_elem() for NAT entries #27652

Merged
merged 2 commits into from Aug 25, 2023

Conversation

julianwiedmann
Copy link
Member

@julianwiedmann julianwiedmann commented Aug 23, 2023

Manual backport, as #24716 is missing from v1.13 and way too intrusive to backport.

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

for pr in 25883; do contrib/backporting/set-labels.py $pr done 1.13; done

or with

make add-labels BRANCH=v1.13 ISSUES=25883

[ upstream commit 1f6c10d ]

[ backporter's notes: as cilium#24716
  is missing, manually add the needed ext_err bits into nat.h and switch
  the callers to send_drop_notify_error_ext(). ]

snat_*_nat_handle_mapping() already takes an *ext_err parameter to pass up
detailed error information from its CT logic. Use this to also report
errors from map_update_elem() when creating the NAT entries.

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

[ backporter's notes: as cilium#24716
  is missing, do the switch to send_drop_notify_error_ext() ]

tail_nodeport_dsr_ingress_ipv*() already maintains an *ext_err parameter to
report detailed error information from its CT logic. Use this to also
report errors from map_update_elem() when creating the RevDNAT entry.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Aug 23, 2023
@julianwiedmann julianwiedmann changed the title V1.13 nat ext err [v1.13] bpf: nat: report detailed error from map_update_elem() for NAT entries Aug 23, 2023
@julianwiedmann
Copy link
Member Author

/test-backport-1.13

@julianwiedmann
Copy link
Member Author

/test-1.26-net-next

@julianwiedmann julianwiedmann marked this pull request as ready for review August 24, 2023 04:34
@julianwiedmann julianwiedmann requested a review from a team as a code owner August 24, 2023 04:34
Copy link
Contributor

@gentoo-root gentoo-root left a comment

Choose a reason for hiding this comment

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

#24716 is missing from v1.13 and way too intrusive to backport.

Those ext_errs would be also useful, it's a pity it wasn't straightforward to backport...

@julianwiedmann
Copy link
Member Author

#24716 is missing from v1.13 and way too intrusive to backport.

Those ext_errs would be also useful, it's a pity it wasn't straightforward to backport...

Yep, I had initially hoped to get them in as well. But it was too many conflicts piling up :/.

Maybe it works better with a clean re-implementation, not trying to resolve the conflicts 1-by-1.

@julianwiedmann julianwiedmann added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 25, 2023
@joestringer joestringer merged commit 524a06b into cilium:v1.13 Aug 25, 2023
60 checks passed
@julianwiedmann julianwiedmann deleted the v1.13-nat-ext_err branch August 25, 2023 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.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