bpfman-operator: Support Load/Attach Split #347

anfredette · 2024-12-09T23:53:39Z

This commit introduces support for bpfman’s load-attach split from bpfman PR
#1354 and includes major
refactoring and CRD changes to align with this new model.

Key Changes:

Remove "*Program" CRDs and related code in favor of the BpfApplication CRD,
which can contain multiple eBPF programs.
Replace BpfProgram CRD with BpfApplicationState, which stores per-node state
information for all eBPF programs in a BpfApplication.
Rename CRDs for better alignment with Kubernetes conventions:
- BpfApplication => ClusterBpfApplication (Cluster-scoped)
- BpfNsApplication => BpfApplication (Namespace-scoped)
The BpfApplication CRDs have been modified to include an optional list of
attach points for each program, enabling pre-loading programs before
attachment and supporting dynamic attachment updates.
Redesign the bpfman-agent controller to natively support BpfApplications.

This code can be executed on KIND with the following command:

BPFMAN_IMG="quay.io/afredette/bpfman:latest" make run-on-kind

Fixes: #397

codecov · 2024-12-10T22:20:18Z

Codecov Report

Attention: Patch coverage is 0% with 789 lines in your changes missing coverage. Please review.

Project coverage is 31.69%. Comparing base (d60c342) to head (e36ff6e).
Report is 8 commits behind head on main.

Files with missing lines	Patch %	Lines
apis/v1alpha1/zz_generated.deepcopy.go	0.00%	690 Missing ⚠️
apis/v1alpha1/shared_types.go	0.00%	42 Missing ⚠️
cmd/bpfman-operator/main.go	0.00%	16 Missing ⚠️
apis/v1alpha1/bpf_application_state_types.go	0.00%	14 Missing ⚠️
...is/v1alpha1/cluster_bpf_application_state_types.go	0.00%	14 Missing ⚠️
cmd/bpfman-agent/main.go	0.00%	7 Missing ⚠️
apis/v1alpha1/zz_generated.register.go	0.00%	6 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##             main     #347       +/-   ##
===========================================
+ Coverage   18.67%   31.69%   +13.01%     
===========================================
  Files         128       66       -62     
  Lines       11211     7794     -3417     
===========================================
+ Hits         2094     2470      +376     
+ Misses       8909     5097     -3812     
- Partials      208      227       +19

Flag	Coverage Δ
unittests	`31.69% <0.00%> (+13.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

anfredette · 2024-12-10T22:32:48Z

All of the examples will need to be updated with the new CRD format before the Kubernetes integration tests will pass.

mergify · 2024-12-18T13:37:05Z

@anfredette, this pull request is now in conflict and requires a rebase.

mergify · 2025-01-09T00:42:52Z

@anfredette, this pull request is now in conflict and requires a rebase.

mergify · 2025-01-22T15:31:48Z

@anfredette, this pull request is now in conflict and requires a rebase.

anfredette · 2025-01-22T16:26:45Z

This is still a WIP, but it's working for cluster-scoped XDP programs.

Here's a sample of the kubectl output from installing and deleting an XDP program:
https://gist.github.com/anfredette/4433aaa58518db5d4d14ed2bf4218f55

If you're looking at the code, the new operator and agent code is in the app-operator and app-agent directories, while the old code is still in bpfman-operator and bpfman-agent. I plan to eventually delete the old directories and rename the new ones, but I'm keeping the old code around for comparison and to pull from as needed.

msherif1234

not sure about renaming the agent files with cl is that for clusterscope ?

msherif1234 · 2025-02-28T11:38:05Z

apis/v1alpha1/bpfApplication_types.go

-	// ProgTypeKretprobe refers to the Kprobe program type.
-	ProgTypeKretprobe EBPFProgType = "Kretprobe"
-
 	// ProgTypeUprobe refers to the Uprobe program type.


I don't know why u deleted the kproberet and uproberet program types ?

They weren't being used.

msherif1234 · 2025-02-28T11:46:06Z

apis/v1alpha1/shared_types.go

+	// MapOwnerSelector is used to select the loaded eBPF program this eBPF program
+	// will share a map with. The value is a label applied to the BpfProgram to select.
+	// The selector must resolve to exactly one instance of a BpfProgram on a given node
+	// or the eBPF program will not load.


we no longer have an object called BpfProgram so we should avoid using it everywhere in code and comments

I got rid of a lot of it, but there's still more work to do.

msherif1234 · 2025-02-28T11:56:35Z

controllers/bpfman-agent/cl-tc-program.go

+			return nil, fmt.Errorf("failed to get container pids: %v", err)
+		}
+
+		if containerInfo != nil && len(*containerInfo) != 0 {


nit no need to check the len range will handle that

anfredette · 2025-02-28T15:15:34Z

not sure about renaming the agent files with cl is that for clusterscope ?

Yes. I was planning to rename things as follows:
cluster-scoped related files: cl_*
namespace-scoped related files: ns_*

This commit introduces support for bpfman’s load-attach split from bpfman PR refactoring and CRD changes to align with this new model. Key Changes: - Remove "*Program" CRDs and related code in favor of the BpfApplication CRD, which can contain multiple eBPF programs. - Replace BpfProgram CRD with BpfApplicationState, which stores per-node state information for all eBPF programs in a BpfApplication. - Rename CRDs for better alignment with Kubernetes conventions: - BpfApplication => ClusterBpfApplication (Cluster-scoped) - BpfNsApplication => BpfApplication (Namespace-scoped) - The BpfApplication CRDs have been modified to include an optional list of attach points for each program, enabling pre-loading programs before attachment and supporting dynamic attachment updates. - Redesign the bpfman-agent controller to natively support BpfApplications. Fixes: bpfman#397 Signed-off-by: Andre Fredette <[email protected]>

Also cleaned up a couple of log messages. Fixes: bpfman#347 Signed-off-by: Andre Fredette <[email protected]>

Also cleaned up a couple of log messages. Fixes: bpfman#398 Signed-off-by: Andre Fredette <[email protected]>

Fixes: bpfman#402 Signed-off-by: Andre Fredette <[email protected]>

- Add missing license declaration. - Fixed up some copyright statements. - Turn cosign verification back on - Ran go mod tidy and vendor Signed-off-by: Andre Fredette <[email protected]>

Signed-off-by: Andre Fredette <[email protected]>

Signed-off-by: Mohamed Mahmoud <[email protected]>

Billy99

Work needs to be done on the integration tests. Merging with integration tests failing and work off main to get tests passing again.

…ithub.com-openshift-api-digest fix(deps): update github.com/openshift/api digest to 635291d

anfredette force-pushed the load-attach-split branch 2 times, most recently from e352df4 to 0531a5f Compare December 10, 2024 22:15

anfredette force-pushed the load-attach-split branch 2 times, most recently from 113089c to 60d0115 Compare December 10, 2024 22:31

mergify bot added the needs-rebase label Dec 18, 2024

anfredette force-pushed the load-attach-split branch from 083793b to 5dce708 Compare December 18, 2024 14:02

mergify bot removed the needs-rebase label Dec 18, 2024

anfredette force-pushed the load-attach-split branch from 5dce708 to 94b2131 Compare January 9, 2025 00:42

mergify bot added the needs-rebase label Jan 9, 2025

anfredette force-pushed the load-attach-split branch from 94b2131 to 8bf9338 Compare January 9, 2025 00:46

mergify bot removed the needs-rebase label Jan 9, 2025

anfredette force-pushed the load-attach-split branch 2 times, most recently from 10366ab to 0c7f942 Compare January 9, 2025 14:57

anfredette force-pushed the load-attach-split branch from 0c7f942 to 218f890 Compare January 22, 2025 15:31

mergify bot added the needs-rebase label Jan 22, 2025

anfredette changed the title ~~WIP: Initial pass at BpfApplication CRD update for load/attach split~~ WIP: New bpfman-operator design and CRDs to support the load/attach split Jan 22, 2025

anfredette force-pushed the load-attach-split branch 2 times, most recently from 2799666 to d68ab2a Compare January 22, 2025 17:19

mergify bot removed the needs-rebase label Jan 22, 2025

anfredette force-pushed the load-attach-split branch from a068f54 to 83561f6 Compare January 23, 2025 00:22

anfredette changed the title ~~WIP: New bpfman-operator design and CRDs to support the load/attach split~~ Initial bpfman-operator support for Load/Attach Split Jan 23, 2025

anfredette force-pushed the load-attach-split branch 3 times, most recently from 69a1b95 to 9e5cb54 Compare January 24, 2025 22:51

dave-tucker mentioned this pull request Feb 27, 2025

bpfman CSI plugin and bpfman CRDs don't align #386

Open

msherif1234 reviewed Feb 28, 2025

View reviewed changes

anfredette force-pushed the load-attach-split branch from 8e72399 to abb5fef Compare February 28, 2025 15:10

anfredette force-pushed the load-attach-split branch 2 times, most recently from 020133b to ca275d1 Compare March 2, 2025 22:42

anfredette changed the title ~~Initial bpfman-operator support for Load/Attach Split~~ bpfman-operator: Support Load/Attach Split Mar 2, 2025

anfredette force-pushed the load-attach-split branch 5 times, most recently from 3b22722 to 4f5cce2 Compare March 3, 2025 20:56

anfredette force-pushed the load-attach-split branch from 4f5cce2 to 7c11035 Compare March 3, 2025 23:38

anfredette added a commit to anfredette/bpfman-operator that referenced this pull request Mar 4, 2025

Fix handling for adding/deleting programs from an existing BpfApp CRD

f9d52e1

Also cleaned up a couple of log messages. Fixes: bpfman#347 Signed-off-by: Andre Fredette <[email protected]>

anfredette force-pushed the load-attach-split branch from f9d52e1 to e44bab8 Compare March 4, 2025 15:56

Fix handling for adding/deleting programs from an existing BpfApp CRD

94fedba

Also cleaned up a couple of log messages. Fixes: bpfman#398 Signed-off-by: Andre Fredette <[email protected]>

anfredette force-pushed the load-attach-split branch from e44bab8 to 94fedba Compare March 4, 2025 16:26

Add support for uretprobe and kretprobe types

3e542fd

Fixes: bpfman#402 Signed-off-by: Andre Fredette <[email protected]>

anfredette marked this pull request as ready for review March 4, 2025 22:36

anfredette force-pushed the load-attach-split branch 2 times, most recently from ade3ce8 to 9927f56 Compare March 5, 2025 01:47

A few small fixups

813f640

- Add missing license declaration. - Fixed up some copyright statements. - Turn cosign verification back on - Ran go mod tidy and vendor Signed-off-by: Andre Fredette <[email protected]>

anfredette force-pushed the load-attach-split branch from 9927f56 to 813f640 Compare March 5, 2025 11:49

anfredette and others added 2 commits March 5, 2025 11:15

Change back to using bpfman from bpfman/main

d39b7f3

Signed-off-by: Andre Fredette <[email protected]>

tmp disable xdp test

e36ff6e

Signed-off-by: Mohamed Mahmoud <[email protected]>

msherif1234 force-pushed the load-attach-split branch from 973968f to e36ff6e Compare March 5, 2025 17:59

Billy99 approved these changes Mar 5, 2025

View reviewed changes

Billy99 merged commit a5cbbbe into bpfman:main Mar 5, 2025
12 of 13 checks passed

msherif1234 pushed a commit to msherif1234/bpfman-operator that referenced this pull request Mar 27, 2025

Merge pull request bpfman#347 from openshift/konflux/mintmaker/main/g…

6f0d4b0

…ithub.com-openshift-api-digest fix(deps): update github.com/openshift/api digest to 635291d

bpfman-operator: Support Load/Attach Split #347

bpfman-operator: Support Load/Attach Split #347

Uh oh!

Conversation

anfredette commented Dec 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Dec 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

anfredette commented Dec 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mergify bot commented Dec 18, 2024

Uh oh!

mergify bot commented Jan 9, 2025

Uh oh!

mergify bot commented Jan 22, 2025

Uh oh!

anfredette commented Jan 22, 2025

Uh oh!

msherif1234 left a comment

Choose a reason for hiding this comment

Uh oh!

msherif1234 Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

anfredette Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

msherif1234 Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

anfredette Mar 2, 2025

Choose a reason for hiding this comment

Uh oh!

msherif1234 Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

anfredette Mar 2, 2025

Choose a reason for hiding this comment

Uh oh!

anfredette commented Feb 28, 2025

Uh oh!

Billy99 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

anfredette commented Dec 9, 2024 •

edited

Loading

codecov bot commented Dec 10, 2024 •

edited

Loading

anfredette commented Dec 10, 2024 •

edited

Loading