fork-only-invoke-khugepaged-ksm-hooks-if-no-error.patch removed from -mm tree
The quilt patch titled
Subject: fork: only invoke khugepaged, ksm hooks if no error
has been removed from the -mm tree. Its filename was
fork-only-invoke-khugepaged-ksm-hooks-if-no-error.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: fork: only invoke khugepaged, ksm hooks if no error
Date: Tue, 15 Oct 2024 18:56:06 +0100
There is no reason to invoke these hooks early against an mm that is in an incomplete state.
The change in commit d24062914837 ("fork: use __mt_dup() to duplicate maple tree in dup_mmap()") makes this more pertinent as we may be in a state where entries in the maple tree are not yet consistent.
Their placement early in dup_mmap() only appears to have been meaningful for early error checking, and since functionally it'd require a very small allocation to fail (in practice 'too small to fail') that'd only occur in the most dire circumstances, meaning the fork would fail or be OOM'd in any case.
Since both khugepaged and KSM tracking are there to provide optimisations to memory performance rather than critical functionality, it doesn't really matter all that much if, under such dire memory pressure, we fail to register an mm with these.
As a result, we follow the example of commit d2081b2bf819 ("mm:
khugepaged: make khugepaged_enter() void function") and make ksm_fork() a void function also.
We only expose the mm to these functions once we are done with them and only if no error occurred in the fork operation.
---
include/linux/ksm.h | 10 ++++------ kernel/fork.c | 7 ++----- 2 files changed, 6 insertions(+), 11 deletions(-)
include/linux/ksm.h renamed from include/linux/ksm.h~fork-only-invoke-khugepaged-ksm-hooks-if-no-error +4 -6
@@ -54,12 +54,11 @@ static inline long mm_ksm_zero_pages(strreturn atomic_long_read (&mm->ksm_zero_pages); } -static inline int ksm_fork (struct mm_struct *mm,struct mm_struct *oldmm) +static inline void ksm_fork (struct mm_struct *mm,struct mm_struct *oldmm) { +/* Adding mm to ksm is best effort on fork. */ if (test_bit (MMF_VM_MERGEABLE , &oldmm->flags)) -return __ksm_enter (mm); - -return 0 ; +__ksm_enter (mm); }static inline int ksm_execve (struct mm_struct *mm)
@@ -107,9 +106,8 @@ static inline int ksm_disable(struct mm_return 0 ; } -static inline int ksm_fork (struct mm_struct *mm,struct mm_struct *oldmm) +static inline void ksm_fork (struct mm_struct *mm,struct mm_struct *oldmm) { -return 0 ; }static inline int ksm_execve (struct mm_struct *mm)
kernel/fork.c renamed from kernel/fork.c~fork-only-invoke-khugepaged-ksm-hooks-if-no-error +2 -5
@@ -653,11 +653,6 @@ static __latent_entropy int dup_mmap(str mm->exec_vm = oldmm->exec_vm; mm->stack_vm = oldmm->stack_vm; - retval =ksm_fork (mm, oldmm); -if (retval) - goto out; -khugepaged_fork (mm, oldmm); -/* Use __mt_dup() to efficiently build an identical maple tree. */ retval =__mt_dup (&oldmm->mm_mt, &mm->mm_mt,GFP_KERNEL );if (unlikely (retval))
@@ -760,6 +755,8 @@ loop_out:vma_iter_free (&vmi);if (!retval) {mt_set_in_rcu (vmi.mas.tree); +ksm_fork (mm, oldmm); +khugepaged_fork (mm, oldmm); }else if (mpnt) {/* * The entire maple tree has already been duplicated. If the
_
Patches currently in -mm which might be from [email protected] are
mm-avoid-unsafe-vma-hook-invocation-when-error-arises-on-mmap-hook.patch mm-unconditionally-close-vmas-on-error.patch mm-refactor-map_deny_write_exec.patch mm-resolve-faulty-mmap_region-error-path-behaviour.patch selftests-mm-add-pkey_sighandler_xx-hugetlb_dio-to-gitignore.patch mm-refactor-mm_access-to-not-return-null.patch mm-refactor-mm_access-to-not-return-null-fix.patch mm-madvise-unrestrict-process_madvise-for-current-process.patch maple_tree-do-not-hash-pointers-on-dump-in-debug-mode.patch tools-testing-fix-phys_addr_t-size-on-64-bit-systems.patch tools-testing-fix-phys_addr_t-size-on-64-bit-systems-fix.patch tools-testing-add-additional-vma_internalh-stubs.patch mm-isolate-mmap-internal-logic-to-mm-vmac.patch mm-refactor-__mmap_region.patch mm-defer-second-attempt-at-merge-on-mmap.patch mm-pagewalk-add-the-ability-to-install-ptes.patch mm-add-pte_marker_guard-pte-marker.patch mm-madvise-implement-lightweight-guard-page-mechanism.patch tools-testing-update-tools-uapi-header-for-mman-commonh.patch selftests-mm-add-self-tests-for-guard-page-feature.patch