Refactor: Use interface to configure libbpf global data when loading bpf programs. #9663
+94
−102
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sridhartigera
added
docs-not-required
sridhartigera
changed the title
tomastigera
reviewed
Jan 5, 2025
felix/bpf/libbpf/libbpf.go
Outdated
| @@ -492,6 +485,20 @@ func XDPSetGlobals( | |||
| return err | |||
| } | |||
|
|
|||
| func SetGlobalData(m *Map, data interface{}) error { | |||
There was a problem hiding this comment.
Suggested change
| func SetGlobalData(m *Map, data interface{}) error { | |
| func SetGlobalData(m *Map, data any) error { |
felix/bpf/libbpf/libbpf.go
Outdated
| func SetGlobalData(m *Map, data interface{}) error { | ||
| switch v := data.(type) { | ||
| case *TcGlobalData: | ||
| return tcSetGlobals(m, v) |
There was a problem hiding this comment.
Why not to have this function to be a method of each of the globals structs and then define an interface with that method (if need be) and call that method rather than using any and this switch?
felix/bpf/conntrack/bpf_scanner.go
Outdated
| @@ -145,17 +145,17 @@ func (s *BPFProgLivenessScanner) ensureBPFExpiryProgram() (*libbpf.Obj, error) { | |||
| continue | |||
| } | |||
|
|
|||
| err := libbpf.CTCleanupSetGlobals( | |||
| err := libbpf.SetGlobalData( | |||
There was a problem hiding this comment.
Could this be?
Suggested change
| err := libbpf.SetGlobalData( | |
| err := &libbpf.CTCleanupGlobalData{...}.Set(m) |
There was a problem hiding this comment.
Prefer doing it this way. Will update the PR shortly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
We have different set of global data one for Tc programs, one for CTLB and one for conntrack cleanup when loading bpf programs. Configuring each global has a separate API. This PR provides a single API to configure global data for bpf programs.
Related issues/PRs
Todos
Release Note
Reminder for the reviewer
Make sure that this PR has the correct labels and milestone set.
Every PR needs one
docs-*label.docs-pr-required: This change requires a change to the documentation that has not been completed yet.docs-completed: This change has all necessary documentation completed.docs-not-required: This change has no user-facing impact and requires no docs.Every PR needs one
release-note-*label.release-note-required: This PR has user-facing changes. Most PRs should have this label.release-note-not-required: This PR has no user-facing changes.Other optional labels:
cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.