ksm-add-ksm-zero-pages-for-each-process.patch removed from -mm tree
The quilt patch titled
Subject: ksm: add ksm zero pages for each process
has been removed from the -mm tree. Its filename was
ksm-add-ksm-zero-pages-for-each-process.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: xu xin <[email protected]>
Subject: ksm: add ksm zero pages for each process
Date: Tue, 13 Jun 2023 11:09:38 +0800
As the number of ksm zero pages is not included in ksm_merging_pages per process when enabling use_zero_pages, it's unclear of how many actual pages are merged by KSM. To let users accurately estimate their memory demands when unsharing KSM zero-pages, it's necessary to show KSM zero- pages per process. In addition, it help users to know the actual KSM profit because KSM-placed zero pages are also benefit from KSM.
since unsharing zero pages placed by KSM accurately is achieved, then tracking empty pages merging and unmerging is not a difficult thing any longer.
Since we already have /proc/<pid>/ksm_stat, just add the information of 'ksm_zero_pages' in it.
---
fs/proc/base.c | 1 + include/linux/ksm.h | 8 +++++--- include/linux/mm_types.h | 9 +++++++-- mm/khugepaged.c | 2 +- mm/ksm.c | 1 + mm/memory.c | 4 ++-- 6 files changed, 17 insertions(+), 8 deletions(-)
fs/proc/base.c renamed from fs/proc/base.c~ksm-add-ksm-zero-pages-for-each-process +1 -0
@@ -3207,6 +3207,7 @@ static int proc_pid_ksm_stat(struct seq_ mm =get_task_mm (task);if (mm) {seq_printf (m,"ksm_rmap_items %lu\n" , mm->ksm_rmap_items); +seq_printf (m,"ksm_zero_pages %lu\n" , mm->ksm_zero_pages);seq_printf (m,"ksm_merging_pages %lu\n" , mm->ksm_merging_pages);seq_printf (m,"ksm_process_profit %ld\n" ,ksm_process_profit (mm));mmput (mm);
include/linux/ksm.h renamed from include/linux/ksm.h~ksm-add-ksm-zero-pages-for-each-process +5 -3
@@ -35,10 +35,12 @@ void __ksm_exit(struct mm_struct *mm);extern unsigned long ksm_zero_pages; -static inline void ksm_might_unmap_zero_page (pte_t pte) +static inline void ksm_might_unmap_zero_page (struct mm_struct *mm,pte_t pte) { -if (is_ksm_zero_pte (pte)) +if (is_ksm_zero_pte (pte)) { ksm_zero_pages--; + mm->ksm_zero_pages--; + } }static inline int ksm_fork (struct mm_struct *mm,struct mm_struct *oldmm)
@@ -109,7 +111,7 @@ static inline void ksm_exit(struct mm_st { } -static inline void ksm_might_unmap_zero_page (pte_t pte) +static inline void ksm_might_unmap_zero_page (struct mm_struct *mm,pte_t pte) { }
include/linux/mm_types.h renamed from include/linux/mm_types.h~ksm-add-ksm-zero-pages-for-each-process +7 -2
@@ -812,7 +812,7 @@ struct mm_struct {#ifdef CONFIG_KSM /* * Represent how many pages of this process are involved in KSM -* merging. +* merging (not including ksm_zero_pages). */ unsigned long ksm_merging_pages;/*
@@ -820,7 +820,12 @@ struct mm_struct {* including merged and not merged. */ unsigned long ksm_rmap_items; -#endif +/* +* Represent how many empty pages are merged with kernel zero +* pages when enabling KSM use_zero_pages. +*/ +unsigned long ksm_zero_pages; +#endif /* CONFIG_KSM */ #ifdef CONFIG_LRU_GEN struct { /* this mm_struct is on lru_gen_mm_list */
mm/khugepaged.c renamed from mm/khugepaged.c~ksm-add-ksm-zero-pages-for-each-process +1 -1
@@ -710,7 +710,7 @@ static void __collapse_huge_page_copy_suspin_lock (ptl);ptep_clear (vma->vm_mm, address, _pte);spin_unlock (ptl); -ksm_might_unmap_zero_page (pteval); +ksm_might_unmap_zero_page (vma->vm_mm, pteval); } }else { src_page =pte_page (pteval);
mm/ksm.c renamed from mm/ksm.c~ksm-add-ksm-zero-pages-for-each-process +1 -0
@@ -1233,6 +1233,7 @@ static int replace_page(struct vm_area_s*/ newpte =pte_mkdirty (pte_mkspecial (pfn_pte (page_to_pfn (kpage), vma->vm_page_prot))); ksm_zero_pages++; + mm->ksm_zero_pages++;/* * We're replacing an anonymous page with a zero page, which is * not anonymous. We need to do proper accounting otherwise we
mm/memory.c renamed from mm/memory.c~ksm-add-ksm-zero-pages-for-each-process +2 -2
@@ -1434,7 +1434,7 @@ static unsigned long zap_pte_range(struczap_install_uffd_wp_if_needed (vma, addr, pte, details, ptent);if (unlikely (!page)) { -ksm_might_unmap_zero_page (ptent); +ksm_might_unmap_zero_page (mm, ptent);continue ; }
@@ -3130,7 +3130,7 @@ static vm_fault_t wp_page_copy(struct vminc_mm_counter (mm,MM_ANONPAGES ); } }else { -ksm_might_unmap_zero_page (vmf->orig_pte); +ksm_might_unmap_zero_page (mm, vmf->orig_pte);inc_mm_counter (mm,MM_ANONPAGES ); }flush_cache_page (vma, vmf->address,pte_pfn (vmf->orig_pte));
_
Patches currently in -mm which might be from [email protected] are