* [PATCH] mm/ksm: do not inherit ksm_zero_pages counter or PTE markers on fork
@ 2026-11-17 8:18 xu.xin
2026-11-17 9:51 ` David Hildenbrand (Arm)
2026-11-17 12:27 ` kernel test robot
0 siblings, 2 replies; 3+ messages in thread
From: xu.xin @ 2026-11-17 8:18 UTC (permalink / raw)
To: David Hildenbrand
Cc: Donet Tom, Chengming Zhou, Andrew Morton, linux-mm, linux-kernel,
Xu Xin, stable
From: "Xu Xin (vivo)" <xu.xin@linux.dev>
As documented in Documentation/admin-guide/mm/ksm.rst, ksm_zero_pages
accounts only for zero pages actually placed by KSM. However, the
current implementation wrongly accounts for forked zero-page PTEs as
KSM's contribution, inflating both the child's per-mm counter and the
global ksm_zero_pages counter.
Originally, commit e2942062e01d ("ksm: count all zero pages placed by
KSM") marked KSM-placed zero-page PTEs with the dirty bit for unmap
accounting, but forgot to clear this marker during fork(). Later, to
prevent ksm_might_unmap_zero_page() from underflowing the counters on
child exit[1], commit 4d6fc29f3634 ("mm/ksm: fix incorrect KSM counter
handling in mm_struct during fork") kept the child's inherited per-mm
counter and added it to the global counter.
Instead of inflating the counters, fix the root cause by resetting the
child's mm->ksm_zero_pages to 0 in ksm_fork() and clearing the dirty
bit marker via pte_mkclean() when copying a KSM zero PTE in
__copy_present_ptes(). With the marker cleared,
ksm_might_unmap_zero_page() will not decrement the counters on child
exit, MADV_UNMERGEABLE in the child will not unnecessarily unshare
inherited zero pages, and the global counter remains untouched.
[1] https://lore.kernel.org/all/53a7bf3d-843d-4e19-b0a3-cc6852fe72c1@redhat.com/
Fixes: 4d6fc29f3634 ("mm/ksm: fix incorrect KSM counter handling in mm_struct during fork")
Cc: stable@vger.kernel.org
Signed-off-by: Xu Xin (vivo) <xu.xin@linux.dev>
---
include/linux/ksm.h | 8 +++++---
mm/memory.c | 8 ++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/include/linux/ksm.h b/include/linux/ksm.h
index 93793ca6bcc4..3c6db19d825e 100644
--- a/include/linux/ksm.h
+++ b/include/linux/ksm.h
@@ -56,11 +56,13 @@ static inline void ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
{
/* Adding mm to ksm is best effort on fork. */
if (mm_flags_test(MMF_VM_MERGEABLE, oldmm)) {
- long nr_ksm_zero_pages = atomic_long_read(&mm->ksm_zero_pages);
-
+ /*
+ * Child's inherited zero-page PTEs are unmarked on copy and
+ * were not placed by KSM in the child, so reset its counter.
+ */
mm->ksm_merging_pages = 0;
mm->ksm_rmap_items = 0;
- atomic_long_add(nr_ksm_zero_pages, &ksm_zero_pages);
+ atomic_long_set(&mm->ksm_zero_pages, 0);
__ksm_enter(mm);
}
}
diff --git a/mm/memory.c b/mm/memory.c
index cf075fcec3c5..7dce96af2a51 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1160,6 +1160,14 @@ static __always_inline void __copy_present_ptes(struct vm_area_struct *dst_vma,
pte = pte_mkclean(pte);
pte = pte_mkold(pte);
+ /*
+ * Clear the dirty-bit marker on KSM-placed zero-page PTEs in the
+ * child so inherited mappings are not accounted against the child or
+ * unshared by MADV_UNMERGEABLE. Special PTEs always have nr == 1.
+ */
+ if (is_ksm_zero_pte(pte))
+ pte = pte_mkclean(pte);
+
set_ptes(dst_vma->vm_mm, addr, dst_pte, pte, nr);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mm/ksm: do not inherit ksm_zero_pages counter or PTE markers on fork
2026-11-17 8:18 [PATCH] mm/ksm: do not inherit ksm_zero_pages counter or PTE markers on fork xu.xin
@ 2026-11-17 9:51 ` David Hildenbrand (Arm)
2026-11-17 12:27 ` kernel test robot
1 sibling, 0 replies; 3+ messages in thread
From: David Hildenbrand (Arm) @ 2026-11-17 9:51 UTC (permalink / raw)
To: xu.xin
Cc: Donet Tom, Chengming Zhou, Andrew Morton, linux-mm, linux-kernel,
stable
On 11/17/26 09:18, xu.xin@linux.dev wrote:
> From: "Xu Xin (vivo)" <xu.xin@linux.dev>
Hi,
thanks for the report.
>
> As documented in Documentation/admin-guide/mm/ksm.rst, ksm_zero_pages
> accounts only for zero pages actually placed by KSM. However, the
> current implementation wrongly accounts for forked zero-page PTEs as
> KSM's contribution, inflating both the child's per-mm counter and the
> global ksm_zero_pages counter.
But ... they were placed by KSM?
Just like any other KSM folios deduplicated before fork and then shared with the
child?
So won't there be an inconsistency when MADV_UNMERGEABLE?
>
> Originally, commit e2942062e01d ("ksm: count all zero pages placed by
> KSM") marked KSM-placed zero-page PTEs with the dirty bit for unmap
> accounting, but forgot to clear this marker during fork(). Later, to
> prevent ksm_might_unmap_zero_page() from underflowing the counters on
> child exit[1], commit 4d6fc29f3634 ("mm/ksm: fix incorrect KSM counter
> handling in mm_struct during fork") kept the child's inherited per-mm
> counter and added it to the global counter.
>
> Instead of inflating the counters, fix the root cause by resetting the
> child's mm->ksm_zero_pages to 0 in ksm_fork() and clearing the dirty
> bit marker via pte_mkclean() when copying a KSM zero PTE in
> __copy_present_ptes(). With the marker cleared,
> ksm_might_unmap_zero_page() will not decrement the counters on child
> exit, MADV_UNMERGEABLE in the child will not unnecessarily unshare
> inherited zero pages, and the global counter remains untouched.
>
> [1] https://lore.kernel.org/all/53a7bf3d-843d-4e19-b0a3-cc6852fe72c1@redhat.com/
>
> Fixes: 4d6fc29f3634 ("mm/ksm: fix incorrect KSM counter handling in mm_struct during fork")
> Cc: stable@vger.kernel.org
> Signed-off-by: Xu Xin (vivo) <xu.xin@linux.dev>
> ---
> include/linux/ksm.h | 8 +++++---
> mm/memory.c | 8 ++++++++
> 2 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/ksm.h b/include/linux/ksm.h
> index 93793ca6bcc4..3c6db19d825e 100644
> --- a/include/linux/ksm.h
> +++ b/include/linux/ksm.h
> @@ -56,11 +56,13 @@ static inline void ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
> {
> /* Adding mm to ksm is best effort on fork. */
> if (mm_flags_test(MMF_VM_MERGEABLE, oldmm)) {
> - long nr_ksm_zero_pages = atomic_long_read(&mm->ksm_zero_pages);
> -
> + /*
> + * Child's inherited zero-page PTEs are unmarked on copy and
> + * were not placed by KSM in the child, so reset its counter.
> + */
> mm->ksm_merging_pages = 0;
> mm->ksm_rmap_items = 0;
> - atomic_long_add(nr_ksm_zero_pages, &ksm_zero_pages);
So I think there is definitely a BUG int he existing code when we skip copying
some VMAs during fork. We should have instead adjusted the counter as we
duplicate them into the child process.
> + atomic_long_set(&mm->ksm_zero_pages, 0);
> __ksm_enter(mm);
> }
> }
> diff --git a/mm/memory.c b/mm/memory.c
> index cf075fcec3c5..7dce96af2a51 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -1160,6 +1160,14 @@ static __always_inline void __copy_present_ptes(struct vm_area_struct *dst_vma,
> pte = pte_mkclean(pte);
> pte = pte_mkold(pte);
>
> + /*
> + * Clear the dirty-bit marker on KSM-placed zero-page PTEs in the
> + * child so inherited mappings are not accounted against the child or
> + * unshared by MADV_UNMERGEABLE. Special PTEs always have nr == 1.
> + */
> + if (is_ksm_zero_pte(pte))
> + pte = pte_mkclean(pte);
> +
> set_ptes(dst_vma->vm_mm, addr, dst_pte, pte, nr);
> }
>
--
Cheers,
David
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mm/ksm: do not inherit ksm_zero_pages counter or PTE markers on fork
2026-11-17 8:18 [PATCH] mm/ksm: do not inherit ksm_zero_pages counter or PTE markers on fork xu.xin
2026-11-17 9:51 ` David Hildenbrand (Arm)
@ 2026-11-17 12:27 ` kernel test robot
1 sibling, 0 replies; 3+ messages in thread
From: kernel test robot @ 2026-11-17 12:27 UTC (permalink / raw)
To: xu.xin, David Hildenbrand
Cc: llvm, oe-kbuild-all, Donet Tom, Chengming Zhou, Andrew Morton,
Linux Memory Management List, linux-kernel, Xu Xin, stable
Hi,
kernel test robot noticed the following build errors:
[auto build test ERROR on akpm-mm/mm-everything]
url: https://github.com/intel-lab-lkp/linux/commits/xu-xin-linux-dev/mm-ksm-do-not-inherit-ksm_zero_pages-counter-or-PTE-markers-on-fork/20261117-161821
base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
patch link: https://lore.kernel.org/r/20261117081821.7211-1-xu.xin%40linux.dev
patch subject: [PATCH] mm/ksm: do not inherit ksm_zero_pages counter or PTE markers on fork
config: hexagon-allnoconfig (https://download.01.org/0day-ci/archive/20261117/202611172040.LO8S0kBo-lkp@intel.com/config)
compiler: clang version 24.0.0git (https://github.com/llvm/llvm-project a69be15ed58ed48738a69ec4c7d0f3e8c7dbe4ce)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20261117/202611172040.LO8S0kBo-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202611172040.LO8S0kBo-lkp@intel.com/
All errors (new ones prefixed by >>):
>> mm/memory.c:1168:6: error: call to undeclared function 'is_ksm_zero_pte'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
1168 | if (is_ksm_zero_pte(pte))
| ^
1 error generated.
vim +/is_ksm_zero_pte +1168 mm/memory.c
1123
1124 static __always_inline void __copy_present_ptes(struct vm_area_struct *dst_vma,
1125 struct vm_area_struct *src_vma, pte_t *dst_pte, pte_t *src_pte,
1126 pte_t pte, unsigned long addr, int nr)
1127 {
1128 struct mm_struct *src_mm = src_vma->vm_mm;
1129 bool writable;
1130
1131 /*
1132 * Snapshot writability before the RWP-disarm rewrite below: when the
1133 * child is not RWP-armed, pte_modify(pte, dst_vma->vm_page_prot) can
1134 * silently drop _PAGE_RW from a resolved (no-marker) writable PTE,
1135 * so a later pte_write(pte) check would skip the COW wrprotect and
1136 * leave the parent writable over a folio shared with the child.
1137 */
1138 writable = pte_write(pte);
1139
1140 /*
1141 * Child is not RWP-armed: restore accessible protection so the
1142 * inherited PAGE_NONE does not cost a fault on first read. Gate on
1143 * pte_uffd(pte) so unrelated PAGE_NONE markers (e.g. NUMA balancing)
1144 * are not normalised away.
1145 */
1146 if (!userfaultfd_protected(dst_vma)) {
1147 if (userfaultfd_rwp(src_vma) && pte_uffd(pte))
1148 pte = pte_modify(pte, dst_vma->vm_page_prot);
1149 pte = pte_clear_uffd(pte);
1150 }
1151
1152 /* If it's a COW mapping, write protect it both processes. */
1153 if (vma_is_cow_mapping(src_vma) && writable) {
1154 wrprotect_ptes(src_mm, addr, src_pte, nr);
1155 pte = pte_wrprotect(pte);
1156 }
1157
1158 /* If it's a shared mapping, mark it clean in the child. */
1159 if (src_vma->vm_flags & VM_SHARED)
1160 pte = pte_mkclean(pte);
1161 pte = pte_mkold(pte);
1162
1163 /*
1164 * Clear the dirty-bit marker on KSM-placed zero-page PTEs in the
1165 * child so inherited mappings are not accounted against the child or
1166 * unshared by MADV_UNMERGEABLE. Special PTEs always have nr == 1.
1167 */
> 1168 if (is_ksm_zero_pte(pte))
1169 pte = pte_mkclean(pte);
1170
1171 set_ptes(dst_vma->vm_mm, addr, dst_pte, pte, nr);
1172 }
1173
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-17 12:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-17 8:18 [PATCH] mm/ksm: do not inherit ksm_zero_pages counter or PTE markers on fork xu.xin
2026-11-17 9:51 ` David Hildenbrand (Arm)
2026-11-17 12:27 ` kernel test robot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox