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.12] bpf: add missing drop notifications #28437

Merged
merged 4 commits into from
Oct 9, 2023

Conversation

julianwiedmann
Copy link
Member

@julianwiedmann julianwiedmann commented Oct 6, 2023

Manual backport of

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

for pr in 25183; do contrib/backporting/set-labels.py $pr done 1.12; done

or with

make add-labels BRANCH=v1.12 ISSUES=25183

[ upstream commit f601b4c ]

We're returning a DROP reason, but nothing outside do_netdev() creates the
corresponding drop notification from it.

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

do_netdev_encrypt_encap() can return various errors, but its caller doesn't
raise the corresponding drop notification.

Also clean up the one case in do_netdev_encrypt_encap() where we currently
*do* raise a drop notification.

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

__encap_and_redirect_with_nodeid() expects the caller to handle this check.
Otherwise we end up encapsulating with an OuterDstIP of 0.0.0.0.

I looked at all the other users, looks like this was the only one missing.

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

Align with all the other error paths in tail_handle_arp() and raise a drop
notification on error. This function is executed as a tail-call, so there's
no surrounding code that would do this for us otherwise.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Oct 6, 2023
@julianwiedmann
Copy link
Member Author

julianwiedmann commented Oct 6, 2023

/test-backport-1.12

Job 'Cilium-PR-K8s-1.18-kernel-4.9' failed:

Click to show.

Test Name

K8sUpdates Tests upgrade and downgrade from a Cilium stable image to master

Failure Output

FAIL: Unable to download helm chart v1.11 from GitHub

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.18-kernel-4.9/237/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.18-kernel-4.9 so I can create one.

Then please upload the Jenkins artifacts to that issue.

@julianwiedmann julianwiedmann marked this pull request as ready for review October 6, 2023 11:28
@julianwiedmann julianwiedmann requested a review from a team as a code owner October 6, 2023 11:28
@julianwiedmann
Copy link
Member Author

/test-1.18-4.9

1 similar comment
@qmonnet
Copy link
Member

qmonnet commented Oct 9, 2023

/test-1.18-4.9

@julianwiedmann julianwiedmann added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 9, 2023
@jrajahalme jrajahalme merged commit 327471c into cilium:v1.12 Oct 9, 2023
56 checks passed
@maintainer-s-little-helper maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 9, 2023
@julianwiedmann julianwiedmann deleted the v1.12-drop-notify branch October 9, 2023 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants