-
Notifications
You must be signed in to change notification settings - Fork 32
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
Add netlink debug to kernels #289
base: develop
Are you sure you want to change the base?
Conversation
CRIU requires NETLINK_DEBUG for capturing socket info for checkpoint and restore. This adds the module for that use case. Signed-off-by: Matthew Yeazel <[email protected]>
CRIU requires NETLINK_DEBUG for capturing socket info for checkpoint and restore. This adds the module for that use case. Signed-off-by: Matthew Yeazel <[email protected]>
CRIU requires NETLINK_DEBUG for capturing socket info for checkpoint and restore. This adds the module for that use case. Signed-off-by: Matthew Yeazel <[email protected]>
@@ -1312,6 +1312,7 @@ install -p -m 0644 %{S:302} %{buildroot}%{_cross_bootconfigdir}/05-metal.conf | |||
%{_cross_kmoddir}/kernel/net/netfilter/xt_TPROXY.ko.* | |||
%{_cross_kmoddir}/kernel/net/netfilter/xt_TRACE.ko.* | |||
%{_cross_kmoddir}/kernel/net/netfilter/xt_u32.ko.* | |||
%{_cross_kmoddir}/kernel/net/netlink/netlink_diag.ko.* |
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.
Why is this the only spec file change? All three kernel configs look as if they should create a kmod.
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.
The modules
section in the other two kernel spec files are not as explicit. We are choosing exactly which modules we want in 6.1 but 5.10 and 5.15 basically include all the modules via this: https://github.com/bottlerocket-os/bottlerocket-core-kit/blob/develop/packages/kernel-5.10/kernel-5.10.spec#L302. So the specific break out is required only for 6.1. This is why I tried the other kernels explicitly to make sure the module is loadable on a booted box.
|
This just adds the one module.
It isn't needed for most operations, so loading it only when you need it keeps the kernel binary smaller. We can make it built-in if we would like, but I tend to opt for loadable modules unless we expect the vast majority of use cases to need it. |
Issue number:
Closes # bottlerocket-os/bottlerocket#4313
Description of changes:
CRIU requires NETLINK_DEBUG for capturing socket info for checkpoint and restore. This adds the module to the kernel config for that use case.
Testing done:
Built
aws-k8s-1.31
and confirmed module loads.Confirmed the same works on
aws-k8s-1.24
(5.15 kernel) andaws-ecs-1
(5.10 kernel). I also checkedaarch64
for 6.1 kernel.Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.