DLPX-96594 fix linux-kernel-generic upstream merge for 6.17#388
Open
DLPX-96594 fix linux-kernel-generic upstream merge for 6.17#388
Conversation
c73de93 to
becd38a
Compare
becd38a to
150606a
Compare
This file contains hidden or 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
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.
Problem
After updating to kernel 6.17, linux-kernel-generic was failing to build the
perftool with:15:14:09 mmap.c: In function ‘perf_mmap__read’:
15:14:09 mmap.c:217:38: error: invalid use of undefined type ‘union perf_event’
15:14:09 217 | if (diff >= (int)sizeof(event->header)) {
15:14:09 | ^~
15:14:09 mmap.c:221:29: error: invalid use of undefined type ‘union perf_event’
15:14:09 221 | size = event->header.size;
15:14:09 | ^~
15:14:09 mmap.c:223:40: error: invalid use of undefined type ‘union perf_event’
15:14:09 223 | if (size < sizeof(event->header) || diff < (int)size)
15:14:09 | ^~
15:14:09 make[5]: *** [/export/home/delphix/jenkins/workspace/linux-pkg/develop/build-package/linux-kernel-generic/pre-push/linux-pkg/packages/linux-kernel-generic/tmp/repo/debian/build/tools-perarch/tools/build/Makefile.build:86: /export/home/delphix/jenkins/workspace/linux-pkg/develop/build-package/linux-kernel-generic/pre-push/linux-pkg/packages/linux-kernel-generic/tmp/repo/debian/build/tools-perarch/tools/perf/libperf/mmap.o] Error 1
I did not root-cause the perf compilation failure. However, in default-package-config.sh we have:Solution
We don't have any custom modifications to
perf, and it is provided by linux-tools-common, so we don't need to be building it. This PR addsdo_tools_perf=false.
https://selfservice-jenkins.eng-tools-prd.aws.delphixcloud.com/job/appliance-build-orchestrator-pre-push/13331/Testing Done