-
Notifications
You must be signed in to change notification settings - Fork 9
kernel: use 6.12.44 on both Linux and macOS, revendor kernel patches #52
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.
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
base: main
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR updates the kernel version from 6.12.46 to 6.12.57 and simplifies the kernel configuration approach by standardizing on a single version across platforms.
Key Changes:
- Updated default kernel version to 6.12.57 in docker-bake.hcl
- Updated kernel configuration files to reflect the new version
- Simplified macOS build instructions by removing explicit version override
Reviewed Changes
Copilot reviewed 4 out of 8 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| kernel/config-6.12.57-x86_64 | Updated kernel configuration header comment to reflect version bump from 6.12.44 to 6.12.57 |
| kernel/config-6.12.57-arm64 | Updated kernel configuration header comment to reflect version bump from 6.12.44 to 6.12.57 |
| docker-bake.hcl | Bumped default KERNEL_VERSION variable from 6.12.46 to 6.12.57 |
| README.md | Removed explicit KERNEL_VERSION parameter from macOS build instructions to use the default |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
ddbd0b6 to
d2dc941
Compare
robmry
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Do we still want to offer TSI, as well as (the option to) hook up network interfaces?
Yeah, we should keep it — at least to demonstrate this capability. |
d2dc941 to
9ccf5b5
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
Copilot reviewed 12 out of 16 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
9ccf5b5 to
1dc77b4
Compare
1dc77b4 to
54b53d1
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
Copilot reviewed 12 out of 16 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Commit 8473bde added TSI support and set CONFIG_TSI in 6.12.44 kernel config files, but not in others. Build instructions in the README.md were instructing users to build 6.12.44 on macOS, but not on Linux. This caused confusion as users on Linux would build a kernel without TSI. Moreover, nerdbox users who need a custom kernel should maintain their own kernel config file out-of-tree, so there's little purpose in providing multiple kernel versions in-tree. Drop all kernel config files, and align with the kernel version used by libkrunfw. Signed-off-by: Albin Kerouanton <[email protected]>
These patches were taken from [1] and include the following changes: - [tsi: fix tsi_create](containers/libkrunfw@dbeeffd) - [tsi: fix sock release](containers/libkrunfw@fdcbd92) - [tsi: implement TSIv3](containers/libkrunfw@4a6259f) - [vsock: unify table locks](containers/libkrunfw@1c6d2d8) [1]: containers/libkrunfw@8a8c33f Signed-off-by: Albin Kerouanton <[email protected]>
54b53d1 to
13f95c9
Compare
|
This fixes TSI on Linux, but now containers won't start on macOS… I'll put this PR into draft mode as I won't have time to fix it next week. |
kernel: use 6.12.44 on both Linux and macOS
Commit akerouanton@8473bde added TSI support and set CONFIG_TSI in 6.12.44 kernel config files, but not in others. Build instructions in the README.md were instructing users to build 6.12.44 on macOS, but not on Linux. This caused confusion as users on Linux would build a kernel without TSI.
Moreover, nerdbox users who need a custom kernel should maintain their own kernel config file out-of-tree, so there's little purpose in providing multiple kernel versions in-tree.
Drop all kernel config files, and align with the kernel version used by libkrunfw.
TSI: revendor libkrunfw kernel patches
These patches were taken from containers/libkrunfw@8a8c33f and include the following changes: