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

datapath: Move XDP handling from bpf/init.sh to agent #15497

Merged
merged 4 commits into from
Apr 12, 2021
Merged

datapath: Move XDP handling from bpf/init.sh to agent #15497

merged 4 commits into from
Apr 12, 2021

Conversation

brb
Copy link
Member

@brb brb commented Mar 29, 2021

Please see commit msgs.

This is required for the upcoming PCAP tracing integration, as we will need to reload the XDP program during runtime.

@brb brb added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Mar 29, 2021
@brb brb requested a review from a team March 29, 2021 19:41
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Mar 29, 2021
@brb brb requested a review from kkourt March 29, 2021 19:41
@brb
Copy link
Member Author

brb commented Mar 29, 2021

test-me-please

christarazi
christarazi reviewed Mar 29, 2021
View reviewed changes
pkg/datapath/loader/compile.go Outdated Show resolved Hide resolved
pkg/datapath/loader/compile.go Outdated Show resolved Hide resolved
pkg/datapath/loader/netlink.go Show resolved Hide resolved
@brb brb requested a review from christarazi March 30, 2021 10:15
@brb brb force-pushed the pr/brb/compile-bpf-xdp-in-go branch from fde8a3c to 4d3789a Compare March 30, 2021 10:15
@aanm
Copy link
Member

aanm commented Mar 30, 2021

@brb I've changed the release note label to misc since the release note is not decipherable by users.

@aanm aanm added release-note/misc This PR makes changes that have no direct user impact. and removed release-note/minor This PR changes functionality that users may find relevant to operating Cilium. labels Mar 30, 2021
@borkmann borkmann mentioned this pull request Mar 30, 2021
Merged
@brb
Copy link
Member Author

brb commented Mar 30, 2021

test-me-please

@brb
Copy link
Member Author

brb commented Apr 1, 2021

test-me-please

@pchaigno pchaigno added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Apr 6, 2021
brb added 2 commits April 9, 2021 07:30
@brb
datapath: Move XDP unloading to Go
83924c9 
This commit moves obsolete XDP programs unloading from bpf/init.sh to
Go.

The main motivation for it is that we will move all XDP handling bits
from init.sh to Go, as we will need to reload the XDP program during
runtime. Also, in the future we would like to eliminate init.sh.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
@brb
datapath: Compile bpf_xdp.c from Go
4e569b6 
This commit moves bpf_xdp.c compilation from bpf/init.sh to Go. The same
motivation as in the previous commit applies.

In addition, it extends "progInfo" struct to accept extra arguments for
compilation.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
@brb brb force-pushed the pr/brb/compile-bpf-xdp-in-go branch from 4d3789a to f885386 Compare April 9, 2021 05:38
brb added 2 commits April 9, 2021 07:38
@brb
datapath: Load XDP program from Go
855c299 
This commit completely removes XDP handling from bpf/init.sh by moving
the loading of it into the agent.

The cidrmap removal is moved to the place where we delete all disabled
BPF maps.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
@brb
datapath: Get rid of unused bpf/init.sh XDP args
f885386 
Signed-off-by: Martynas Pumputis <m@lambda.lt>
@brb
Copy link
Member Author

brb commented Apr 9, 2021

test-net-next

@brb brb removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Apr 9, 2021
@brb brb added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 9, 2021
@pchaigno
Copy link
Member

test-me-please

@brb
Copy link
Member Author

brb commented Apr 12, 2021

  • CI 4.19 hit the controller bpf-map-sync-cilium_snat_v4_external is failing flake (should be fixed after rebase).
  • CI 4.9 hit Request from testclient-mkqp8 pod to service http://[fd03::54b3]:80 failed from K8sServicesTest Checks service across nodes Checks ClusterIP Connectivity which has nothing to do with my changes.

Marking the PR as ready-to-merge.

@pchaigno
Copy link
Member 

* CI 4.9 hit `Request from testclient-mkqp8 pod to service http://[fd03::54b3]:80 failed` from `K8sServicesTest Checks service across nodes Checks ClusterIP Connectivity` which has nothing to do with my changes.

Do we have an issue opened for that one? I'm seeing a lot of similar flakes, but it's unclear if some are the same underlying cause.

@brb
Copy link
Member Author

brb commented Apr 12, 2021

@pchaigno It seems to be an instance of #15425.

@pchaigno pchaigno merged commit a7b992c into master Apr 12, 2021
1.10.0 automation moved this from In progress to Done Apr 12, 2021
@pchaigno pchaigno deleted the pr/brb/compile-bpf-xdp-in-go branch April 12, 2021 12:58
This was referenced Apr 28, 2021
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kkourt kkourt kkourt approved these changes

@christarazi christarazi christarazi approved these changes

@aanm aanm aanm approved these changes

Assignees
No one assigned
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.
Projects
No open projects
1.10.0
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@brb @aanm @pchaigno @kkourt @christarazi @borkmann