Fix ProgramInfo.MapIDs for programs without maps on old kernels #905
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
force-pushed
the
prog-info-map-ids
branch
3 times, most recently
from
3c49107
to
8916621
Compare
Currently, the (*ProgramInfo).MapIDs()'s bool return value is determined by pi.ids != nil, pi.ids being allocated when NrMapIds > 0. The NrMapIds field will always be zero on older kernels that don't yet support it, so it's currently impossible to tell if the prog actually references 0 maps, or whether the kernel is too old to populate the field. Fix this by adding a feature test. Signed-off-by: Lorenz Bauer <oss@lmb.io>
Using the IsKernelLessThan helper means that kernel version comparisons are checked against CI_MAX_KERNEL_VERSION. It's also less to type and will give better output on failure. Signed-off-by: Lorenz Bauer <oss@lmb.io>
lmb
force-pushed
the
prog-info-map-ids
branch
from
8916621
to
7a080d6
Compare
ti-mo
reviewed
Jan 23, 2023
| err = sys.ObjInfo(prog, &sys.ProgInfo{ | ||
| // NB: Don't need to allocate MapIds since the program isn't using | ||
| // any maps. | ||
| NrMapIds: 1, |
There was a problem hiding this comment.
Clever! Could also check NrMapIds == 0 here to skip the two err checks below. (or simply err == nil)
ti-mo
approved these changes
Jan 23, 2023
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.
Fixes #535.