mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-16 14:19:36 +02:00
mm/ksm: fix ksm_zero_pages accounting
commitc2dc78b86e
upstream. We normally ksm_zero_pages++ in ksmd when page is merged with zero page, but ksm_zero_pages-- is done from page tables side, where there is no any accessing protection of ksm_zero_pages. So we can read very exceptional value of ksm_zero_pages in rare cases, such as -1, which is very confusing to users. Fix it by changing to use atomic_long_t, and the same case with the mm->ksm_zero_pages. Link: https://lkml.kernel.org/r/20240528-b4-ksm-counters-v3-2-34bb358fdc13@linux.dev Fixes:e2942062e0
("ksm: count all zero pages placed by KSM") Fixes:6080d19f07
("ksm: add ksm zero pages for each process") Signed-off-by: Chengming Zhou <chengming.zhou@linux.dev> Acked-by: David Hildenbrand <david@redhat.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Hugh Dickins <hughd@google.com> Cc: Ran Xiaokai <ran.xiaokai@zte.com.cn> Cc: Stefan Roesch <shr@devkernel.io> Cc: xu xin <xu.xin16@zte.com.cn> Cc: Yang Yang <yang.yang29@zte.com.cn> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
0a82b46a01
commit
99ed145f46
|
@ -3207,7 +3207,7 @@ static int proc_pid_ksm_stat(struct seq_file *m, struct pid_namespace *ns,
|
||||||
mm = get_task_mm(task);
|
mm = get_task_mm(task);
|
||||||
if (mm) {
|
if (mm) {
|
||||||
seq_printf(m, "ksm_rmap_items %lu\n", mm->ksm_rmap_items);
|
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_zero_pages %ld\n", mm_ksm_zero_pages(mm));
|
||||||
seq_printf(m, "ksm_merging_pages %lu\n", mm->ksm_merging_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));
|
seq_printf(m, "ksm_process_profit %ld\n", ksm_process_profit(mm));
|
||||||
mmput(mm);
|
mmput(mm);
|
||||||
|
|
|
@ -33,16 +33,27 @@ void __ksm_exit(struct mm_struct *mm);
|
||||||
*/
|
*/
|
||||||
#define is_ksm_zero_pte(pte) (is_zero_pfn(pte_pfn(pte)) && pte_dirty(pte))
|
#define is_ksm_zero_pte(pte) (is_zero_pfn(pte_pfn(pte)) && pte_dirty(pte))
|
||||||
|
|
||||||
extern unsigned long ksm_zero_pages;
|
extern atomic_long_t ksm_zero_pages;
|
||||||
|
|
||||||
|
static inline void ksm_map_zero_page(struct mm_struct *mm)
|
||||||
|
{
|
||||||
|
atomic_long_inc(&ksm_zero_pages);
|
||||||
|
atomic_long_inc(&mm->ksm_zero_pages);
|
||||||
|
}
|
||||||
|
|
||||||
static inline void ksm_might_unmap_zero_page(struct mm_struct *mm, 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--;
|
atomic_long_dec(&ksm_zero_pages);
|
||||||
mm->ksm_zero_pages--;
|
atomic_long_dec(&mm->ksm_zero_pages);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline long mm_ksm_zero_pages(struct mm_struct *mm)
|
||||||
|
{
|
||||||
|
return atomic_long_read(&mm->ksm_zero_pages);
|
||||||
|
}
|
||||||
|
|
||||||
static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
|
static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
|
@ -899,7 +899,7 @@ struct mm_struct {
|
||||||
* Represent how many empty pages are merged with kernel zero
|
* Represent how many empty pages are merged with kernel zero
|
||||||
* pages when enabling KSM use_zero_pages.
|
* pages when enabling KSM use_zero_pages.
|
||||||
*/
|
*/
|
||||||
unsigned long ksm_zero_pages;
|
atomic_long_t ksm_zero_pages;
|
||||||
#endif /* CONFIG_KSM */
|
#endif /* CONFIG_KSM */
|
||||||
#ifdef CONFIG_LRU_GEN
|
#ifdef CONFIG_LRU_GEN
|
||||||
struct {
|
struct {
|
||||||
|
|
11
mm/ksm.c
11
mm/ksm.c
|
@ -282,7 +282,7 @@ static unsigned int zero_checksum __read_mostly;
|
||||||
static bool ksm_use_zero_pages __read_mostly;
|
static bool ksm_use_zero_pages __read_mostly;
|
||||||
|
|
||||||
/* The number of zero pages which is placed by KSM */
|
/* The number of zero pages which is placed by KSM */
|
||||||
unsigned long ksm_zero_pages;
|
atomic_long_t ksm_zero_pages = ATOMIC_LONG_INIT(0);
|
||||||
|
|
||||||
#ifdef CONFIG_NUMA
|
#ifdef CONFIG_NUMA
|
||||||
/* Zeroed when merging across nodes is not allowed */
|
/* Zeroed when merging across nodes is not allowed */
|
||||||
|
@ -1242,8 +1242,7 @@ static int replace_page(struct vm_area_struct *vma, struct page *page,
|
||||||
* the dirty bit in zero page's PTE is set.
|
* the dirty bit in zero page's PTE is set.
|
||||||
*/
|
*/
|
||||||
newpte = pte_mkdirty(pte_mkspecial(pfn_pte(page_to_pfn(kpage), vma->vm_page_prot)));
|
newpte = pte_mkdirty(pte_mkspecial(pfn_pte(page_to_pfn(kpage), vma->vm_page_prot)));
|
||||||
ksm_zero_pages++;
|
ksm_map_zero_page(mm);
|
||||||
mm->ksm_zero_pages++;
|
|
||||||
/*
|
/*
|
||||||
* We're replacing an anonymous page with a zero page, which is
|
* We're replacing an anonymous page with a zero page, which is
|
||||||
* not anonymous. We need to do proper accounting otherwise we
|
* not anonymous. We need to do proper accounting otherwise we
|
||||||
|
@ -3105,7 +3104,7 @@ static void wait_while_offlining(void)
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
long ksm_process_profit(struct mm_struct *mm)
|
long ksm_process_profit(struct mm_struct *mm)
|
||||||
{
|
{
|
||||||
return (long)(mm->ksm_merging_pages + mm->ksm_zero_pages) * PAGE_SIZE -
|
return (long)(mm->ksm_merging_pages + mm_ksm_zero_pages(mm)) * PAGE_SIZE -
|
||||||
mm->ksm_rmap_items * sizeof(struct ksm_rmap_item);
|
mm->ksm_rmap_items * sizeof(struct ksm_rmap_item);
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_PROC_FS */
|
#endif /* CONFIG_PROC_FS */
|
||||||
|
@ -3384,7 +3383,7 @@ KSM_ATTR_RO(pages_volatile);
|
||||||
static ssize_t ksm_zero_pages_show(struct kobject *kobj,
|
static ssize_t ksm_zero_pages_show(struct kobject *kobj,
|
||||||
struct kobj_attribute *attr, char *buf)
|
struct kobj_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
return sysfs_emit(buf, "%ld\n", ksm_zero_pages);
|
return sysfs_emit(buf, "%ld\n", atomic_long_read(&ksm_zero_pages));
|
||||||
}
|
}
|
||||||
KSM_ATTR_RO(ksm_zero_pages);
|
KSM_ATTR_RO(ksm_zero_pages);
|
||||||
|
|
||||||
|
@ -3393,7 +3392,7 @@ static ssize_t general_profit_show(struct kobject *kobj,
|
||||||
{
|
{
|
||||||
long general_profit;
|
long general_profit;
|
||||||
|
|
||||||
general_profit = (ksm_pages_sharing + ksm_zero_pages) * PAGE_SIZE -
|
general_profit = (ksm_pages_sharing + atomic_long_read(&ksm_zero_pages)) * PAGE_SIZE -
|
||||||
ksm_rmap_items * sizeof(struct ksm_rmap_item);
|
ksm_rmap_items * sizeof(struct ksm_rmap_item);
|
||||||
|
|
||||||
return sysfs_emit(buf, "%ld\n", general_profit);
|
return sysfs_emit(buf, "%ld\n", general_profit);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user