kernel: Update to 5.10.186, 5.15.122, and 6.1.41 #3339
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
Rebase to Amazon Linux upstream version 5.10.186-179.751.amzn2. Signed-off-by: Leonard Foerster <[email protected]>
Rebase to Amazon Linux upstream version 5.15.122-77.145.amzn2. Signed-off-by: Leonard Foerster <[email protected]>
Rebase to Amazon Linux upstream version 6.1.41-63.114.amzn2023. Drop backport of Zenbleed mitigation in favour of upstream variant included in upstream version v6.1.41. Signed-off-by: Leonard Foerster <[email protected]>
markusboehme
approved these changes
Aug 14, 2023
There was a problem hiding this comment.
The config changes and the patch revert make sense to me to stay closer to upstream. The Amazon Linux kernel repository on GitHub seems to have issue tracking turned off, but perhaps we can compare notes on our differing approaches for building out-of-tree graphics drivers via the discussion feature on the commit.
bcressey
approved these changes
Aug 14, 2023
packages/kernel-6.1/1005-Revert-Revert-drm-fb_helper-improve-CONFIG_FB-depend.patch
Outdated
Show resolved
Hide resolved
Amazon Linux reverted an upstream patch cleaning up DRM config option dependency as they wanted to retain the old behavior in order to provide dependency options for nvidia DKMS. For Bottlerocket we had solved this issue already by enableing DRM_SIMPLEDRM in fd73bff, retaining upstream functionality. Signed-off-by: Leonard Foerster <[email protected]>
Amazon Linux has added some specific SCSI drivers on their kernels. We do not need these for vmware and aws use cases and had set them already for the metal variants separately. Disable them for the generic case in order to not introduce additional bloat. Signed-off-by: Leonard Foerster <[email protected]>
foersleo
force-pushed
the
kernel_update_2023-08-11
branch
from
31d6351
to
a62b9da
Compare
|
⬆️ force push softened the language in the commit message as requested by Ben. |
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 the Zenbleed fix from #3300 for 5.15 and 6.1, so drop the downstream backports. In addition I did drop one downstream patch from Amazon Linux that reverted an upstream commit to accommodate for nvidia driver dependencies, which we provide differently. I finally removed the various added SCSI drivers from the generic config for 6.1. We carry these drivers on the metal variants already and only need them there.
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 some changes:
The full diff-report on Gist.
Summary of changes:
For 5.10 and 5.15 series upstream removed the
DECNETdriver from the kernels as it had been orphaned in 2010 already. It has been removed in 5.10 through 1c004b379b03 introduced in 5.10.185 and in 5.15 through 2a974abc0976 introduced in 5.15.118.6.1:
CRYPTO_DH_RFC7919_GROUPS n -> yandCRYPTO_SHA3 m -> yhave been set by AL as part of work to get towards FIPS certification readiness.+DEVICE_PRIVATE ywas enabled by AL to cater to CUDA 12.2 usage of HMM to allow for seamless sharing data between host memory and accelerator devices. The following options are changed as a result of this:+GET_FREE_REGION y-> selected byDEVICE_PRIVATEZONE_DEVICE n -> y-> dependency of DEVICE_PRIVATE+DEVICE_MIGRATION y-> defined asMIGRATION && ZONE_DEVICE+PCI_P2PDMA n,+FS_DAX n,+XEN_UNPOPULATED_ALLOC n-> depend onZONE_DEVICEand are thus now visible+X86_PLATFORM_DRIVERS_HP n- Consolidation of HP platform drivers under this new toplevel option introduced in v6.1.30 through 1189b7f495408-HP_ACCEL n-> now depends onX86_PLATFORM_DRIVERS_HP-HP_WMI n-> now depends onX86_PLATFORM_DRIVERS_HP+LOCK_MM_AND_FIND_VMA y- new option introduced in v6.1.37 through d6a5c7a1a6e52-SMBFS_COMMON mand+SMBFS m-> reorganize SMBFS options upstream, introduced in v6.1.36 through 29429a1f5871Terms 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.