Skip to content

tools: port the dragonball kernel patch to 6.12.x #11513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Jul 7, 2025
Merged

tools: port the dragonball kernel patch to 6.12.x #11513

merged 2 commits into from
Jul 7, 2025

Conversation

lifupan
Copy link
Member

@lifupan lifupan commented Jul 3, 2025 •
edited
Loading

Backport the dragonball's kernel patches to
6.12.x kernel version.

Fixes:#10483

@Apokleos Apokleos requested review from fidencio and zvonkok July 4, 2025 06:06
@fidencio
Copy link
Member

fidencio commented Jul 4, 2025

@lifupan, @Apokleos, I will review this one Today, and I'd like to run the tests with it before reviewing.

@fidencio fidencio force-pushed the dragonball_6.12.x branch from 4bf92e8 to e511671 Compare July 6, 2025 16:40
@fidencio
Copy link
Member

fidencio commented Jul 6, 2025

I've bumped the kernel version and I'm letting the 6.12.36 be built with @lifupan's changes to the dragonball patches, which allows us to fully test those in the CI.

Thanks @lifupan!

@fidencio fidencio force-pushed the dragonball_6.12.x branch from e511671 to 51b930e Compare July 6, 2025 21:02
@fidencio
Copy link
Member

fidencio commented Jul 6, 2025 •
edited
Loading 

drivers/misc/dragonball/upcall_srv/dragonball_device_manager.c:27:10: fatal error: asm/mpspec.h: No such file or directory
   27 | #include <asm/mpspec.h>
      |          ^~~~~~~~~~~~~~
compilation terminated.
  CC      drivers/base/cacheinfo.o
make[6]: *** [scripts/Makefile.build:229: drivers/misc/dragonball/upcall_srv/dragonball_device_manager.o] Error 1
make[5]: *** [scripts/Makefile.build:478: drivers/misc/dragonball/upcall_srv] Error 2
make[4]: *** [scripts/Makefile.build:478: drivers/misc/dragonball] Error 2
make[3]: *** [scripts/Makefile.build:478: drivers/misc] Error 2
make[3]: *** Waiting for unfinished jobs....

@lifupan, this comes from trying to build the dragonball kernel on arm64, and was happening because both asm/mpspec.h and asm/acpi.h are x86_64 specific.

I've included them conditionally and force-pushed to your branch.

CI at least builds the kernel now without issues, and Tomorrow morning we can check whether the tests passed.

Assuming the tests are green, I'll approve it. Thanks for (also) working on this one!

@fidencio fidencio force-pushed the dragonball_6.12.x branch from 51b930e to c4dab0e Compare July 6, 2025 21:39
Fupan Li and others added 2 commits July 6, 2025 23:48
@fidencio
tools: port the dragonball kernel patch to 6.12.x
fd21c9d 
Backport the dragonball's kernel patches to
6.12.x kernel version.

Signed-off-by: Fupan Li <fupan.lfp@antgroup.com>
@fidencio
kernel: Bump to v6.12.36
a2faf93 
As that's the latest releasesd LTS.

Signed-off-by: Fabiano Fidêncio <fidencio@northflank.com>
@fidencio fidencio force-pushed the dragonball_6.12.x branch from c4dab0e to a2faf93 Compare July 6, 2025 21:48
fidencio
fidencio approved these changes Jul 7, 2025
View reviewed changes
Copy link
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks @lifupan!

stevenhorsman
stevenhorsman approved these changes Jul 7, 2025
View reviewed changes
Copy link
Member

@stevenhorsman stevenhorsman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming that the SNP tests pass

@fidencio fidencio merged commit ef545ee into kata-containers:main Jul 7, 2025
516 of 535 checks passed
@lifupan
Copy link
Member Author

lifupan commented Jul 9, 2025 

drivers/misc/dragonball/upcall_srv/dragonball_device_manager.c:27:10: fatal error: asm/mpspec.h: No such file or directory
   27 | #include <asm/mpspec.h>
      |          ^~~~~~~~~~~~~~
compilation terminated.
  CC      drivers/base/cacheinfo.o
make[6]: *** [scripts/Makefile.build:229: drivers/misc/dragonball/upcall_srv/dragonball_device_manager.o] Error 1
make[5]: *** [scripts/Makefile.build:478: drivers/misc/dragonball/upcall_srv] Error 2
make[4]: *** [scripts/Makefile.build:478: drivers/misc/dragonball] Error 2
make[3]: *** [scripts/Makefile.build:478: drivers/misc] Error 2
make[3]: *** Waiting for unfinished jobs....

@lifupan, this comes from trying to build the dragonball kernel on arm64, and was happening because both asm/mpspec.h and asm/acpi.h are x86_64 specific.

I've included them conditionally and force-pushed to your branch.

CI at least builds the kernel now without issues, and Tomorrow morning we can check whether the tests passed.

Assuming the tests are green, I'll approve it. Thanks for (also) working on this one!

That's great, thanks @fidencio

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fidencio fidencio fidencio approved these changes

@stevenhorsman stevenhorsman stevenhorsman approved these changes

@zvonkok zvonkok Awaiting requested review from zvonkok

Assignees
No one assigned
Labels
ok-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lifupan @fidencio @stevenhorsman