prog: Allow empty data for prog.Test and prog.Run #685
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
lmb
requested changes
May 27, 2022
|
Ping |
ti-mo
reviewed
Jun 28, 2022
internal/cmd/gentypes/main.go
Outdated
| @@ -179,6 +179,13 @@ import ( | |||
| {"FuncInfo", "bpf_func_info", nil}, | |||
| {"LineInfo", "bpf_line_info", nil}, | |||
| {"XdpMd", "xdp_md", nil}, | |||
| { | |||
| "BpfSkLookup", "bpf_sk_lookup", | |||
There was a problem hiding this comment.
@lmb Shouldn't this be BPFSKLookup? Same for XdpMdand BtfInfo above. :/
There was a problem hiding this comment.
It's easier to automate generating names like BtfInfo vs capitalising some things.
prog_test.go
Outdated
| Family: 2, /* AF_INET */ | ||
| } | ||
| opts := RunOptions{ | ||
| Data: []byte{}, |
There was a problem hiding this comment.
I think this could be removed, the call to sys.NewSlicePointer(opts.Data) in testRun() will return a Pointer{} whether Data is nil or length 0.
prog_test.go
Outdated
| defer prog.Close() | ||
|
|
||
| skLookup := sys.BpfSkLookup{ | ||
| Family: 2, /* AF_INET */ |
There was a problem hiding this comment.
Feel free to add an entry to internal/unix/types_*.go.
Will be used for unit testing BPF_PROG_TYPE_SK_LOOKUP progs. IPs are stored as arrays of bytes to make use from Go easier.
Certain prog types (SK_LOOKUP, RAW_TRACEPOINT and RAW_TRACEPOINT_WRITABLE) require that data_in is NULL. The previous check prevented 0 length data_in. Fix by removing check.
lmb
approved these changes
Jul 5, 2022
|
Sorry for the long delay, I wasn't aware that you had made changes and then I was busy with life when you pinged me. Thanks for following up :) |
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.
Certain prog types (SK_LOOKUP, RAW_TRACEPOINT and
RAW_TRACEPOINT_WRITABLE) require that data_in is NULL. The previous
check prevented 0 length data_in.
Fix by removing check.
Followup from #647.