Skip to content
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

Update kernels #29

Merged
merged 3 commits into from
Jul 15, 2024
Merged

Conversation

arnaldo2792
Copy link
Contributor

@arnaldo2792 arnaldo2792 commented Jul 12, 2024

Issue number:

N / A

Description of changes:
Update kernels to the latest upstream versions:

  • 5.10.220
  • 5.15.161
  • 6.1.96

Patch changes

  • 5.10 changed one patch:
    • 0085-NFS-Clean-up-nfs_readdir_page_filler.patch
  • 5.10 added one patch:
    • 0866-nfs-Leave-pages-in-the-pagecache-if-readpage-failed.patch
  • 5.15 changed seven patches:
    • 0103-mptcp-add-new-mptcp_fill_diag-helper.patch
    • 0104-mptcp-add-MPTCP_INFO-getsockopt.patch
    • 0111-mptcp-Support-for-IP_TOS-for-MPTCP-setsockopt.patch
    • 0112-mptcp-sockopt-add-SOL_IP-freebind-transparent-option.patch
    • 0114-mptcp-add-TCP_INQ-cmsg-support.patch
    • 0118-mptcp-getsockopt-add-support-for-IP_TOS.patch
    • 0122-mptcp-support-TCP_CORK-and-TCP_NODELAY.patch
  • 5.15 added one patch:
    • 0158-nfs-Leave-pages-in-the-pagecache-if-readpage-failed.patch
  • 6.1 added one patch:
    • 0176-cifs-use-origin-fullpath-for-automounts.patch

Configuration Changes

Summary:

config-aarch64-5.10-diff:	  0 removed,   0 added,   0 changed
config-aarch64-5.15-diff:	  0 removed,   0 added,   0 changed
config-aarch64-6.1-diff:	  0 removed,   0 added,   0 changed
config-x86_64-5.10-diff:	  2 removed,   2 added,   0 changed
config-x86_64-5.15-diff:	  0 removed,   0 added,   0 changed
config-x86_64-6.1-diff:	  1 removed,   5 added,   6 changed

Report:

==> /tmp/configs//config-aarch64-5.10-diff <==

==> /tmp/configs//config-aarch64-5.15-diff <==

==> /tmp/configs//config-aarch64-6.1-diff <==

==> /tmp/configs//config-x86_64-5.10-diff <==
-NFSD_V2_ACL y
-NFSD_V3 y
+NFSD_V2 n
+NFS_V4_2_SSC_HELPER y

==> /tmp/configs//config-x86_64-5.15-diff <==

==> /tmp/configs//config-x86_64-6.1-diff <==
-TICK_CPU_ACCOUNTING y
 NO_HZ_FULL n -> y
 NO_HZ_IDLE y -> n
 PPS m -> y
 PTP_1588_CLOCK m -> y
 PTP_1588_CLOCK_OPTIONAL m -> y
 VIRT_CPU_ACCOUNTING_GEN n -> y
+CONTEXT_TRACKING_USER y
+CONTEXT_TRACKING_USER_FORCE n
+RCU_NOCB_CPU y
+RCU_NOCB_CPU_DEFAULT_ALL n
+VIRT_CPU_ACCOUNTING y

Testing done:

Launched 6 instances: aws-k8s-1.23, aws-k8s-1.24, aws-k8s-1.28, for x86_64 and aarch64. All booted.

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.

@larvacea
Copy link
Member

The ci failure looks like the kernels were not uploaded to the lookaside cache.

Rebase to Amazon Linux upstream version package kernel-6.1.96-102.177.amzn2023

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Rebase to Amazon Linux upstream version package kernel-5.15.161-106.159.amzn2.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Rebase to Amazon Linux upstream version package kernel-5.10.220-209.867.amzn2.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
@arnaldo2792 arnaldo2792 marked this pull request as ready for review July 13, 2024 00:22
@arnaldo2792
Copy link
Contributor Author

(forced push is a rebase onto develop)

Copy link
Contributor

@yeazelm yeazelm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! We got those changes into the x86_64 config so this is great to see!

@koooosh
Copy link
Contributor

koooosh commented Jul 13, 2024

For kernel updates, is a boot check sufficient for testing or are there other tests we would ideally like to run?

@koooosh koooosh self-requested a review July 13, 2024 02:05
@arnaldo2792 arnaldo2792 merged commit b53a1dc into bottlerocket-os:develop Jul 15, 2024
2 checks passed
@arnaldo2792 arnaldo2792 deleted the update-kernels branch September 5, 2024 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants