-
Notifications
You must be signed in to change notification settings - Fork 519
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
kernel: Update to 5.10.184, 5.15.117, and 6.1.29 #3238
Merged
foersleo
merged 9 commits into
bottlerocket-os:develop
from
foersleo:kernel_updates_2023.06_2
Jun 30, 2023
Merged
kernel: Update to 5.10.184, 5.15.117, and 6.1.29 #3238
foersleo
merged 9 commits into
bottlerocket-os:develop
from
foersleo:kernel_updates_2023.06_2
Jun 30, 2023
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
|
foersleo
force-pushed
the
kernel_updates_2023.06_2
branch
from
June 29, 2023 14:12
318a4f7
to
3172239
Compare
Rebase to Amazon Linux upstream version based on 5.10.184. Signed-off-by: Leonard Foerster <[email protected]>
This reverts commit e2083a2. The fix was introduced upstream into the 5.10 series starting with version v5.10.180. We do not need to carry the patch downstream anymore. Signed-off-by: Leonard Foerster <[email protected]>
Rebase to Amazon Linux upstream version based on 5.15.117. Signed-off-by: Leonard Foerster <[email protected]>
This reverts commit a349613. The fix was introduced into the stable 5.15 series upstream in version v5.15.111. We do not need to carry the downstream variant anymore. Signed-off-by: Leonard Foerster <[email protected]>
Rebase to Amazon Linux upstream version based on 6.1.29. Signed-off-by: Leonard Foerster <[email protected]>
In the past we have built-in the upstream smartpqi driver for our metal platforms and inherited the module build on aws/vmware platforms from AL. AL recently introduced a newer version of that driver alongside the in-tree driver. Keep the status quo by only building the in-tree variant, effectively reducing the amount of code built and shipped. Signed-off-by: Leonard Foerster <[email protected]>
We have not used and currently, do not have requests to support edac on that style of hardware. Keep with our kernels small and at the status quo. Signed-off-by: Leonard Foerster <[email protected]>
AL has recently added a bunch of IPMI drivers to their kernels. In Bottlerocket those do not get used currently. Remove the unneeded drivers. Signed-off-by: Leonard Foerster <[email protected]>
Amazon Linux introduced a port of the BBR2 congestion control algorithm. As this is a comparably large patch set that has not made it upstream yet and is marked as alpha/preview state. Disabling it for now to keep our kernel more stable. Signed-off-by: Leonard Foerster <[email protected]>
foersleo
force-pushed
the
kernel_updates_2023.06_2
branch
from
June 30, 2023 10:10
3172239
to
4ff9396
Compare
Update to latest minor version of AL for 5.10 and 5.15. |
markusboehme
approved these changes
Jun 30, 2023
stmcginnis
approved these changes
Jun 30, 2023
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.
Things look good to me.
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: -
Description of changes:
Update kernels to latest AL kernels available in the repositories. With those updates we ingest upstream variants for nftables fix from #3126 , so drop the downstream backports.
Through AL we also got some additional config changes that I went ahead and reverted for us. Some of those are enabling quite substantial code changes that AL has backported (newer version of smartpqi driver and bbr2 congestion control algorithm). I do not think we want to enable those mid-series.
Testing done:
Sonobuoy quick test results. (No test for the 6.1 kernel update as 6.1 currently is only on
*-dev
variants):Config diff reports quite some changes:
The full diff report can be found on Gist.
Summary of changes per kernel series:
5.10
BLK_DEV_SX8
- Driver has been removed upstream in v5.10.184DRM_RCAR_LVDS
andDRM_RCAR_USE_LVDS
- clean up of drm rcar config options in v5.10.183INFINIBAND_I40W
- removed from aarch64 for consistency with x86_64SCSI_DPT_I2O
- unclear why this one comes up now. The functionality is not new and it has been removed upstream, but the removal has not made it to 5.10 tree.IXGBE*
andMDIO
- Add the ixgbe driver to x86_64 for consistency with aarch64 - MDIO gets selected by IXGBE5.15
BLK_DEV_SX8
- Driver has been removed upstream in v5.15.117DRM_RCAR_LVDS
andDRM_RCAR_USE_LVDS
- clean up of drm rcar config options in v5.15.116SCSI_DPT_I2O
- unclear why this one comes up now. The functionality is not new and it has been removed upstream, but the removal has not made it to 5.10 tree.HP_ACCEL
andX86_PLATFORM_DRIVERS_HP
- move HP drivers into central location, renaming options in v5.15.113X86_CPUID
- enable cpuid interface for consistency between kernel series6.1
GCC12_NO_ARRAY_BOUNDS
- option removed to use version agnostic optionCC_NO_ARRAY_BOUNDS
in v6.1.26CRYPTO_FIPS_NAME
- set to be AL specific. I am not quite sure if we want to carry this forwardPTP*
andPPS*
- these are needed for functionality in the newer ENA drivers and a dependency for loading newer enaSFC_SIENA
- depends onPTP_1588_CLOCK
and is thus now visibleRT_GROUP_SCHED
- disable, as allocating real CPU bandwidth for task groups can be problematic with systemd (https://github.com/systemd/systemd/blob/main/README#L144-L150)DP83640_PHY
- new driver for ultra-low-power Ethernet phy - not neededHAVE_*
,LIVEPATCH
,OBJTOOL
,STACK_VALIDATION
,UNWINDER_FRAME_POINTER
- port livepatch capabilities to aarch64, we have these available on previous kernel series as wellX86_CPUID
andX86_MSR
- enable cpuid and msr interface for consistency between kernel seriesTerms 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.