Skip to content

kernel-6.12 : update to 6.12.46-66.121 - #280

Merged
vyaghras merged 1 commit into
developfrom
update_2025-09-29_6.12
Sep 29, 2025
Merged

kernel-6.12 : update to 6.12.46-66.121#280
vyaghras merged 1 commit into
developfrom
update_2025-09-29_6.12

Conversation

@bottlerocket-kernels

Copy link
Copy Markdown
Contributor

Description of changes:

Update Kernel 6.12 to 6.12.46-66.121

Patch summary

Patches that changed:
0060-arm64-stacktrace-report-recovered-PCs.patch -> 0060-arm64-stacktrace-report-recovered-PCs.patch
0066-arm64-entry-add-unwind-info-for-various-kernel-entri.patch -> 0066-arm64-entry-add-unwind-info-for-various-kernel-entri.patch
Patches that were dropped:
0107-x86-sev-Evict-cache-lines-during-memory-acceptance.patch
0110-fs-fhandle.c-fix-a-race-in-call-of-has_locked_childr.patch
0111-netlink-avoid-infinite-retry-looping-in-netlink_unic.patch
Patches that were added:
0111-crypto-rng-fix-incorrect-mutex-unlock-in-crypto_del_.patch
0112-Revert-mm-hugetlb-fix-huge_pmd_unshare-vs-GUP-fast-r.patch
0113-AL2023-6.12-Update-EFA-driver-to-2.17.2.patch
0114-Updating-lustrefsx-to-2.15.6.patch
0115-mm-damon-core-prevent-unnecessary-overflow-in-damos_.patch
0116-proc-fix-type-confusion-in-pde_set_flags.patch
0117-net-mlx5-Introduce-data-placement-ordering-bits.patch
0118-RDMA-mlx5-Support-OOO-RX-WQE-consumption.patch
0119-RDMA-mlx5-Support-querying-per-plane-IB-PortCounters.patch
0120-net-sched-Fix-backlog-accounting-in-qdisc_dequeue_in.patch

Testing done:

Check GH actions

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.

Rebase to Amazon Linux upstream version 6.12.46-66.121.amzn2023.

Signed-off-by: bottlerocket-kernels[bot] <190893109+bottlerocket-kernels[bot]@users.noreply.github.com>
# CONFIG_VHOST_SCSI is not set
CONFIG_VHOST_VSOCK=m
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It seems like this was already set to y by default:

By default, VHOST_ENABLE_FORK_OWNER_CONTROL is set to y,
users can change the worker thread mode as needed.

So effectively this update doesn't have any effect

CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_JIT_DEFAULT_ON=y
CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
CONFIG_USERMODE_DRIVER=y

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We may want to hold on on this one:

https://github.com/gregkh/linux/blob/da274362a7bd9ab3a6e46d15945029145ebce672/kernel/bpf/preload/Kconfig

The default is n and the 6.12 kernel still enables it, even in the updated kernel.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Seems like the USERMODE_DRIVER config was dropped as a followup cleanup of the bfpfilter removal:

torvalds/linux@b7b3500
torvalds/linux@98e20e5e13d2

The bpffilter removal was merged on 6.8, so 6.12 already doesn't have support for CONFIG_USERMODE_DRIVER.

@arnaldo2792

Copy link
Copy Markdown
Contributor

I reviewed the patches with @vyaghras, most of them are cherry-picks, and one of them reverts a fix due to a regression in performance:

https://lore.kernel.org/all/4d3878531c76479d9f8ca9789dc6485d@amazon.de/

@vyaghras
vyaghras merged commit f6982cb into develop Sep 29, 2025
4 checks passed
@vyaghras
vyaghras deleted the update_2025-09-29_6.12 branch September 29, 2025 21:10
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.

3 participants