remove variant sensitivity from 6.1 kernel #3932
Merged
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
Support for zstd-compressed firmware was added to the 5.19 kernel. Now that all `metal-*` variants are on the 6.1 kernel, switch from xz to zstd as part of the larger effort to eliminate xz usage. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Remove the need for conditional compilation by merging the platform- specific config snippets together. Storage drivers that were set to "Y" in any platform config are now "Y" for all platforms. Network drivers that were set to "M" in any platform config are likewise now "M" in the merged config. The simple DRM driver was disabled for `metal` and `vmware` but enabled for `aws`; it is now enabled for all platforms. The i8042 driver was disabled for `aws` but enabled for `metal` and `vmware`; it is also now enabled for all platforms. Switch to a full list of all packaged modules to clarify the full set of available modules. This also paves the way to move certain modules into platform-specific subpackages in a subsequent change. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Add support for zstd-compressed firmware now that the linux-firmware package uses that compression format. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Move the modules that were previously only for "metal" into a new package that's installed by default for `metal-*` variants. This cuts down on the installed footprint for `aws-*` and `vmware-*` variants where the corresponding hardware is not supported. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Block the storage device drivers that were previously only built into the "metal" kernel from loading on `aws-*` and `vmware-*` variants by default. Block the i8042 driver from loading on "aws-*" variants by default, to approximate the effect of disabling the module at build time. These blocks are implemented through bootconfig snippets, where the resulting settings can be changed at runtime if necessary. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Now that the same config is used for all platforms, drop the variant sensitive marker from the package. Signed-off-by: Ben Cressey <bcressey@amazon.com>
larvacea
approved these changes
May 1, 2024
yeazelm
approved these changes
May 1, 2024
Yes, exactly. Storage drivers need to be "y" because the combination of dm-mod.create and |
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.
Issue number:
Related: #3883
Description of changes:
Merge all the platform-specific kernel config snippets back together, and remove variant sensitivity from the
kernel-6.1package.By far the largest (and least interesting) part of this change is the switch to explicit listing of all kernel modules. My goal here is to turn some of the kernel config changes - enabling a new module, making a module built-in, or removing a module - into code changes that can be reviewed in the usual way. My hope is that it can drive some cleanup over time, if not in this kernel then in kernels still to come: adding a
modules-awsandmodules-vmwarepackage, removing unnecessary variation between x86_64 and aarch64, and so forth.modules-metalis a first step in that direction.The bootconfig snippets are a potentially contentious addition. They don't reduce the kernel's increased size or surface area, though they do make it a no-op by default. They won't take effect for in-place upgrades, only for newly provisioned nodes. However, I do see value in making explicit which functionality is not needed on which platforms, to assist future refactoring.
As a free bonus change, switch to zstd for firmware compression to remove another use of xz, and to avoid adding it to
awsandvmwarevariants.Testing done:
No removals, only additions and changes. For the most part, changes are storage drivers (+ dependencies) moving from modules to built-in, and network drivers (+ dependencies) moving from off to modules.
diff-reportanddiff-summaryare available here.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.