mirror of
https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git
synced 2026-09-09 00:07:04 +08:00
Alexandra Hájková
28d428edb5
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/2267 JIRA: https://redhat.atlassian.net/browse/RHEL-145694 Conflict resolution calls for the following dependency list:\ Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/2172 \ Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/2188 \ Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/2218 \ Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/2225 \ Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/2227 CVE: CVE-2024-53219 \ CVE: CVE-2024-57952 \ CVE: CVE-2025-21709 \ CVE: CVE-2025-21896 \ CVE: CVE-2025-21881 \ CVE: CVE-2025-21984 \ CVE: CVE-2025-22034 \ CVE: CVE-2025-38071 \ CVE: CVE-2025-37834 \ CVE: CVE-2025-22030 \ CVE: CVE-2025-37779 \ CVE: CVE-2025-37760 \ CVE: CVE-2025-37908 \ CVE: CVE-2025-37964 \ CVE: CVE-2025-38008 \ CVE: CVE-2025-38029 \ CVE: CVE-2025-38050 \ CVE: CVE-2025-38276 \ CVE: CVE-2025-38359 \ CVE: CVE-2025-38207 \ CVE: CVE-2025-38241 \ CVE: CVE-2025-38242 \ CVE: CVE-2025-38258 \ CVE: CVE-2025-38357 \ CVE: CVE-2025-38518 \ CVE: CVE-2025-38447 \ CVE: CVE-2025-38510 \ CVE: CVE-2025-38519 \ CVE: CVE-2025-39753 \ CVE: CVE-2025-39725 \ CVE: CVE-2025-39879 \ CVE: CVE-2025-39878 \ CVE: CVE-2025-39868 \ CVE: CVE-2025-39941 \ CVE: CVE-2025-40228 \ CVE: CVE-2025-40270 \ CVE: CVE-2026-23109 \ CVE: CVE-2026-43188 \ CVE: CVE-2026-43286 \ CVE: CVE-2026-46121 \ CVE: CVE-2026-46042 \ CVE: CVE-2026-46020 \ CVE: CVE-2026-53162 \ CVE: CVE-2026-53342 \ CVE: CVE-2026-31397 \ CVE: CVE-2026-46284 \ CVE: CVE-2026-31589 \ CVE: CVE-2025-40174 Set of changes to level the RHEL-10 MM-core and dependencies codebase up to upstream's v6.16,\ plus relevant follow-up fixes. To reduce the number of conflicts for the commits in the series,\ this work starts with eight reverts, which are reintroduced later in proper topological order. This changeset is backporting the upstream series that removes the ZBUD compressed page allocator.\ Customers utilizing the ZSWAP feature, however, will not be affected, as the same changeset makes\ ZSMALLOC the default zpool allocator for the compressed swap feature. Only the most relevant and non-conflicting follow-up fixes are being backported out-of-order in\ this series. All other follow-up fixes that would require conflict resolution are deferred,\ and their changesets will be picked up by the work being done for the next incremental update (v6.17 and v6.18). Omitted-fix: b765d69a1adf ("um: Remove outdated comment about STUB_DATA_PAGES")\ Omitted-fix: 44126343d58c ("x86/mm: Disable broadcast TLB flush when PCID is disabled")\ Omitted-fix: 1219e0feaefc ("fs: move initializing f_mode before file_ref_init()")\ Omitted-fix: 711f9b8fbe4f ("fsnotify: disable pre-content and permission events by default")\ Omitted-fix: 2a42754b3104 ("fsnotify: disable notification by default for all pseudo files")\ Omitted-fix: 76f9377cd2ab ("writeback: don't block sync for filesystems with no data integrity guarantees")\ Omitted-fix: 08d9a4580f71 ("tee: shm: Remove refcounting of kernel pages")\ Omitted-fix: b570f37a2ce4 ("mm: Fix a hmm_range_fault() livelock / starvation problem")\ Omitted-fix: 29f40594a281 ("mm/rmap: fix incorrect pte restoration for lazyfree folios")\ Omitted-fix: 9bbffee67ffd ("mm: fix a UAF when vma-\>mm is freed after vma-\>vm_refcnt got dropped")\ Omitted-fix: 743758ccf8be ("Revert "mm/hugetlb: deal with multiple calls to hugetlb_bootmem_alloc"")\ Omitted-fix: a5cdbe9f376f ("mm: shmem: only remove inode from swaplist when it's swapped page count is 0")\ Omitted-fix: 3b617fd3d317 ("mm/vma: enforce VMA fork limit on unfaulted, faulted mremap merge too")\ Omitted-fix: 61f67c230a5e ("mm/vma: fix anon_vma UAF on mremap() faulted, unfaulted merge")\ Omitted-fix: 1aceed565ff1 ("mm/vmscan: fix demotion targets checks in reclaim/demotion")\ Omitted-fix: 4c0ed883e051 ("mm/page_alloc: fix defrag_mode for non-reclaimable allocations")\ Omitted-fix: 396f57b57200 ("mm, swap: speed up hibernation allocation and writeout")\ Omitted-fix: 939080834fef ("mm/huge_memory: fix early failure try_to_migrate() when split huge pmd for shared THP")\ Omitted-fix: 577a1f495fd7 ("mm/huge_memory: fix a folio_split() race condition with folio_try_get()")\ Omitted-fix: f183663901f2 ("mm: consider non-anon swap cache folios in folio_expected_ref_count()")\ Omitted-fix: 878f41243c0d ("mm: page_isolation: avoid unsafe folio reads while scanning compound pages")\ Omitted-fix: a69d1ab971a6 ("mm: Fix a hmm_range_fault() livelock / starvation problem")\ Omitted-fix: d210fdcac9c0 ("mm/damon/core: clear walk_control on inactive context in damos_walk()")\ Omitted-fix: 7071537159be ("mm/damon/core: fix potential memory leak by cleaning ops_filter in damon_destroy_scheme")\ Omitted-fix: 33c3f6c2b48c ("mm/damon/core: fix damos_walk() vs kdamond_fn() exit race")\ Omitted-fix: 55da81663b96 ("mm/damon/core: fix damon_call() vs kdamond_fn() exit race")\ Omitted-fix: 26f775a054c3 ("mm/damon/core: avoid use of half-online-committed context")\ Omitted-fix: 139e7a572af0 ("mm/damon/sysfs: dealloc commit test ctx always")\ Omitted-fix: 7fe000eb3290 ("mm/damon/sysfs: fix param_ctx leak on damon_sysfs_new_test_ctx() failure")\ Omitted-fix: eb1074ece72f ("mm/damon/sysfs: fix param_ctx leak on damon_sysfs_new_test_ctx() failure")\ Omitted-fix: d200cfc81c06 ("mm/damon/sysfs-schemes: fix double increment of nr_regions")\ Omitted-fix: fb39444732f0 ("tools/testing/selftests: add forked (un)/faulted VMA merge tests")\ Omitted-fix: 0ace8f2db6b3 ("tools/testing/selftests: add tests for !tgt, src mremap() merges")\ Omitted-fix: f3bd00507f22 ("selftests/mm: skip uffd-stress test when nr_pages_per_cpu is zero")\ Omitted-fix: e5d3e1422e92 ("selftests/mm: free dynamically allocated PMD-sized buffers in split_huge_page_test")\ Omitted-fix: a99d34e5ecb9 ("Revert "drm/pagemap: Disable device-to-device migration"")\ Omitted-fix: 1a3c0049b3f5 ("Revert "drm/pagemap: Disable device-to-device migration"")\ Omitted-fix: 546e42c8c6d9 ("riscv: Use an atomic xchg in pudp_huge_get_and_clear()")\ Omitted-fix: b7a2b49bba4e ("apparmor: Fix return in ns_mkdir_op")\ Omitted-fix: f171b55f1441 ("mips: fix HIGHMEM initialization") The following list of "omitted fixes" is only to placate the greediness of the bot and reduce the noise it causes\ with its "Upstream patches that reference commits in your MR" list: Omitted-fix: 3de705a43a46 ("mm/vmscan: avoid false-positive -Wuninitialized warning")\ Omitted-fix: 20c098928356 ("kbuild: Bump minimum version of LLVM for building the kernel to 15.0.0")\ Omitted-fix: 200b0d25084d ("arm64: mm: Move KPTI helpers to mmu.c")\ Omitted-fix: 2b81082ad37c ("lib/crypto: curve25519-hacl64: Fix older clang KASAN workaround for GCC")\ Omitted-fix: 494d2f508883 ("fuse: use default writeback accounting")\ Omitted-fix: 3efb9800557b ("mm: do not map the shadow stack as THP")\ Omitted-fix: 8fedac321fb0 ("mm/mempolicy: fix weighted interleave auto sysfs name")\ Omitted-fix: 6cbdd9726fb5 ("mm/mglru: use folio_mark_accessed to replace folio_set_active")\ Omitted-fix: 337927d9895a ("x86/build: Remove cc-option from -mskip-rax-setup")\ Omitted-fix: b013ed403197 ("fs: consistently use can_mmap_file() helper")\ Omitted-fix: 6528d29b46d8 ("fs/xfs: transition from deprecated .mmap hook to .mmap_prepare")\ Omitted-fix: 29d69273fefd ("media: remove STA2x11 media pci driver")\ Omitted-fix: a48bd961fb20 ("kbuild: Remove unnecessary 'T' modifier in cmd_ar_builtin_fixup")\ Omitted-fix: e7e1a26b8ddf ("mm/damon/core: set quota-score histogram with core filters")\ Omitted-fix: a089461a5994 ("Documentation/mm: drop pxx_mkdevmap() descriptions from page table helpers")\ Omitted-fix: a55bc4ffc06d ("staging: rtl8723bs: Avoid memset() in aes_cipher() and aes_decipher()")\ Omitted-fix: 98cf2d503910 ("mfd: Remove STA2x11 core driver")\ Omitted-fix: 13b6b6209104 ("mm: vmscan: fix dirty folios throttling on cgroup v1 for MGLRU")\ Omitted-fix: ea693aaa5ce5 ("mm/shmem: hold shmem_swaplist spinlock (not mutex) much less")\ Omitted-fix: f2a48f8fb564 ("mm: update outdated comments for removed scan_swap_map_slots()")\ Omitted-fix: cf49b4ebd2ae ("mm/bootmem_info: remove call to kmemleak_free_part_phys()")\ Omitted-fix: a0d9555bf9ea ("ceph: fix num_ops off-by-one when crypto allocation fails")\ Omitted-fix: 0279bed34c22 ("Revert "btrfs: fix the file offset calculation inside btrfs_decompress_buf2page()"")\ Omitted-fix: cac190c7674f ("ceph: fix write storm on fscrypted files")\ Omitted-fix: 5dba5cc2e0ff ("mm: introduce VM_MAYBE_GUARD and make visible in /proc/$pid/smaps")\ Omitted-fix: 8356a5a3b078 ("mm, vmstat: remove the NR_WRITEBACK_TEMP node_stat_item counter")\ Omitted-fix: 2c4c3e29897d ("mm/page_alloc: simplify __alloc_pages_slowpath() flow")\ Omitted-fix: 2e3b37a7e48f ("fs: replace mmap hook with .mmap_prepare for simple mappings")\ Omitted-fix: 951ea2f4844c ("fs: convert simple use of generic_file_*_mmap() to .mmap_prepare()")\ Omitted-fix: 0a42d732c136 ("x86/build: Remove cc-option from -mno-fp-ret-in-387")\ Omitted-fix: 237dc6a054f6 ("x86/headers: Replace __ASSEMBLY__ stragglers with __ASSEMBLER__")\ Omitted-fix: 2c6a28f3ef72 ("x86/Kconfig: Clean up LLVM version checks in IBT configurations")\ Omitted-fix: cdea4acce026 ("mm: delete stale comment about cachelines")\ Omitted-fix: 2704ad556cf2 ("x86/Kconfig: Fix lists in X86_EXTENDED_PLATFORM help text")\ Omitted-fix: 2f13daee2a72 ("lib/crypto/curve25519-hacl64: Disable KASAN with clang-17 and older")\ Omitted-fix: 5b44297bcfa4 ("mm/filemap: introduce generic_file_*_mmap_prepare() helpers")\ Omitted-fix: 340b59816bc4 ("mm: kill mm_wr_locked from unmap_vmas() and unmap_single_vma()")\ Omitted-fix: ab3c8e7b8687 ("mm/shmem: update shmem to use mmap_prepare")\ Omitted-fix: 8c90ae8fe5e3 ("fs/ext4: transition from deprecated .mmap hook to .mmap_prepare")\ Omitted-fix: 5e0deb0a6b4e ("arm64: mm: Use generic enum pgtable_level")\ Omitted-fix: c6900f227f89 ("mm/nommu: use file_has_valid_mmap_hooks() helper")\ Omitted-fix: f7a741c53b71 ("mm: do not assume file == vma->vm_file in compat_vma_mmap_prepare()")\ Omitted-fix: 7e6cc9f954aa ("Docs/admin-guide/mm/damon/usage: mark scheme filters sysfs dir as deprecated")\ Omitted-fix: 738a6cf8fc51 ("Merge patch series "convert the majority of file systems to mmap_prepare"") Additional changes that aren't relevant here: Omitted-fix: 6d5fbecd0213 ("MIPS: mm: Add check for highmem before removing memory block") Omitted-fix: 6c6c1fc09de35f409f6971cb9e881103afe5dbe0 ("modpost: require a MODULE_DESCRIPTION()") Signed-off-by: Rafael Aquini <raquini@redhat.com> Approved-by: Andrea Arcangeli <aarcange@redhat.com> Approved-by: Jan Stancek <jstancek@redhat.com> Approved-by: Luiz Capitulino <luizcap@redhat.com> Approved-by: Ricardo Robaina <rrobaina@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Phil Auld <pauld@redhat.com> Approved-by: Jocelyn Falempe <jfalempe@redhat.com> Approved-by: Felix Maurer <fmaurer@redhat.com> Approved-by: Michal Schmidt <mschmidt@redhat.com> Approved-by: ashelat <ashelat@redhat.com> Approved-by: Petr Oros <poros@redhat.com> Approved-by: Michael Petlan <mpetlan@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Alexandra Hájková <ahajkova@redhat.com>