From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23232C25B4F for ; Mon, 13 May 2024 02:49:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 814736B0249; Sun, 12 May 2024 22:49:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 79D946B024A; Sun, 12 May 2024 22:49:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 63FEB6B024B; Sun, 12 May 2024 22:49:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 424F46B0249 for ; Sun, 12 May 2024 22:49:27 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id AE95F40C4B for ; Mon, 13 May 2024 02:49:26 +0000 (UTC) X-FDA: 82111841532.03.9F5E9B2 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [91.218.175.184]) by imf04.hostedemail.com (Postfix) with ESMTP id CE4EC40007 for ; Mon, 13 May 2024 02:49:24 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=SaOAD763; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf04.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.184 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715568565; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UC6iaf4PvBG5oVk2XZb0FLojMUi4ljass05ucI+yrrw=; b=s6k+bXYFv5a2cI2/VlTdz+YhLNus9hmSRyXQu1MlgeHuOI/r66W7DsGDEGhI4XM3IxAqHB 72dlZtNUwk9s1JIXMr3vVRoO5E7tL2dOToLfSHrs3R7LjtsVKCx0jNOIGeVNVWBdhZrMGU iVfUuifd58SaE/rCQEGdgH+Lf67ut9w= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715568565; a=rsa-sha256; cv=none; b=M0VjYGs0VBTvBO6ucQ71krN/Ef6CMTgcWgmGNhK+gcObJrvb+mHoK+ZVZWFSzi++rT7JOC tGD0frAiqNrSay/F4/RU9t2gDENtyuutrC72illZ3/GAr2GQE9yzGDfVh9K9q5CqpvBY0h A0r8Ks3bu+Qbf0Jcv9fWDUalQUZ6PcE= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=SaOAD763; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf04.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.184 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1715568563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UC6iaf4PvBG5oVk2XZb0FLojMUi4ljass05ucI+yrrw=; b=SaOAD763eT3R13yiLscBiucLZhgPrnBUM83E2lDeUkF1GHiPbrL2dGwfP6lwwWI5cau/on hSCyNkkjkDop+bZdJCsxzbxEHeSasDB0fsX3mEJpuH+YfCC9qAJEkPEDfNTVi5l6nWulSy xRur4yRbN7ifx6gxiVe27ZQy/xuY8D4= From: Chengming Zhou Date: Mon, 13 May 2024 10:48:37 +0800 Subject: [PATCH v2 2/2] mm/ksm: fix ksm_zero_pages accounting MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240513-b4-ksm-counters-v2-2-f2520183a8ca@linux.dev> References: <20240513-b4-ksm-counters-v2-0-f2520183a8ca@linux.dev> In-Reply-To: <20240513-b4-ksm-counters-v2-0-f2520183a8ca@linux.dev> To: Andrew Morton , David Hildenbrand , Hugh Dickins , Andrea Arcangeli , Stefan Roesch , xu xin Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, zhouchengming@bytedance.com, Chengming Zhou X-Developer-Signature: v=1; a=ed25519-sha256; t=1715568553; l=4996; i=chengming.zhou@linux.dev; s=20240508; h=from:subject:message-id; bh=HIs8Q5/jFN+FTV35h6aU63PoCjS+jy99jJNO13V7IjY=; b=lAfuCuZAI9NerG7DBCW6HAvSVjR+/AuiAUYAeLb04H2Ooie9DX5DK/qE41uZ84Kk8hi+JS1ci zm9WNcetqVxCcG+ed1FXrUKioojajnFkAfzYeSnzuPcsGYM+8Na3zFW X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=kx40VUetZeR6MuiqrM7kPCcGakk1md0Az5qHwb6gBdU= X-Migadu-Flow: FLOW_OUT X-Stat-Signature: ru7cbqqpsbgbn53rcbtuiidqrtuxbqja X-Rspamd-Queue-Id: CE4EC40007 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1715568564-229713 X-HE-Meta: U2FsdGVkX1+WSkMC9Wjoxco2kVeQ291ESCa9FaXbyjhmcKCk9l/FC0nBrvhRw091XrQIFewk8YYEF9R3Ie1FvHvqhjH7uj/m/ty4RsuVNMOUyXVpmj7FKWuBlX+jviHfo6vIm0pINm0mXhTdEiKsqgSJlGtUrE3e2a7/wFv21riMvLhtWrCwwSfKFha0wDnhmaMZFnjjA2KOaVMd/3sDCJmIls3CcARODrQpSL7CWShHRzZcF12dGkE+7SW8sxB2kYOOeh8/+D/6l9LkmqKCdsXEjeAH3CdZPFLxUnoTzRNK7euVW6/UPRLAr0KrABV22mqHVCc9rIXXEgmSVgxQeilRfUODsAM4RA5AojwV9zMtcUF2F78mpCF+TUnTDyxOB9vvzhyAWuIEtoNWsfZIs43ZJZmn1tHUPGY04DjAAcj+O9lGcF6uH7oAAG8XfkVEpsaCtvKTs9sjouvcXv7cE12NAaI3iBYF1Nvrcw1KltOhVKh26gX+F75wVrQGNWXghDyQ1zH9KxuC/p6yqloQFvgTUNkP01kv2mKSZekM9V9278/VK2Hlx5nwvQ1qzeixK6bLeA0Rf54rqAHfwrcLKdGmlVr0mmocWrB3PF5J9oAbqJyIk6++XmVQb7JjSVqldgipwl9sve9pwK7YUDeHyY7yrxi8PEgcqjt1YKu4jwxQi2dR3I7WnnpjZiE7E2a7G/bcEAoZf9oGDtik5XUlrZqFUX6WcC1B0rREVubwibapgnmR/bVj6rJkeP7me7Z3vHCT3ZABO3JtUqRSedYA7/fhZyWmYKszY19vh+yiRM1HhkmG0Q6KSvxijEwCts13dLLZxiFjNSeqb1/IgJj+XfETYlNLKIV3LJzNjXAQqcRezDIBT/Sg+RJXamb7j703ueWvcdwkCBI7S/gGLWnyOHBo3BYObbBZ241BnhjEZuzOF2VxspiVBStSqexUcw/6Vu0+1Gm0C7ZsDX3Qu5t 0yV4tmC+ fBmQ88MqdX9PmfyWlCJHRM7vEQxfTPQ9QYjqkQGK8SAmKTdjeAMEejs7Eoy09+sS9Gn0vmwiwVI869zIqVZxW+4DBvFpbG8Z2Ap9+AIHNpvTyaVFsijXNz9Oq3UtwqGkTy0Fc6DFg3I6nx64rzppsOiOb3ww1quIWCjBe X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: We normally ksm_zero_pages++ in ksmd when page is merged with zero page, but ksm_zero_pages-- is done from page tables side, which can't protected by the ksmd mutex. 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. Fixes: e2942062e01d ("ksm: count all zero pages placed by KSM") Fixes: 6080d19f0704 ("ksm: add ksm zero pages for each process") Acked-by: David Hildenbrand Signed-off-by: Chengming Zhou --- fs/proc/base.c | 2 +- include/linux/ksm.h | 17 ++++++++++++++--- include/linux/mm_types.h | 2 +- mm/ksm.c | 11 +++++------ 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 18550c071d71..72a1acd03675 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -3214,7 +3214,7 @@ static int proc_pid_ksm_stat(struct seq_file *m, struct pid_namespace *ns, 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_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_process_profit %ld\n", ksm_process_profit(mm)); mmput(mm); diff --git a/include/linux/ksm.h b/include/linux/ksm.h index 52c63a9c5a9c..11690dacd986 100644 --- a/include/linux/ksm.h +++ b/include/linux/ksm.h @@ -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)) -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) { if (is_ksm_zero_pte(pte)) { - ksm_zero_pages--; - mm->ksm_zero_pages--; + atomic_long_dec(&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) { if (test_bit(MMF_VM_MERGEABLE, &oldmm->flags)) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 24323c7d0bd4..af3a0256fa93 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -985,7 +985,7 @@ struct mm_struct { * Represent how many empty pages are merged with kernel zero * pages when enabling KSM use_zero_pages. */ - unsigned long ksm_zero_pages; + atomic_long_t ksm_zero_pages; #endif /* CONFIG_KSM */ #ifdef CONFIG_LRU_GEN_WALKS_MMU struct { diff --git a/mm/ksm.c b/mm/ksm.c index 0f9c491552ff..6f461411d070 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -296,7 +296,7 @@ static bool ksm_use_zero_pages __read_mostly; static bool ksm_smart_scan = true; /* 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); /* The number of pages that have been skipped due to "smart scanning" */ static unsigned long ksm_pages_skipped; @@ -1429,8 +1429,7 @@ static int replace_page(struct vm_area_struct *vma, struct page *page, * 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))); - ksm_zero_pages++; - mm->ksm_zero_pages++; + ksm_map_zero_page(mm); /* * We're replacing an anonymous page with a zero page, which is * not anonymous. We need to do proper accounting otherwise we @@ -3373,7 +3372,7 @@ static void wait_while_offlining(void) #ifdef CONFIG_PROC_FS 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); } #endif /* CONFIG_PROC_FS */ @@ -3662,7 +3661,7 @@ KSM_ATTR_RO(pages_skipped); static ssize_t ksm_zero_pages_show(struct kobject *kobj, 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); @@ -3671,7 +3670,7 @@ static ssize_t general_profit_show(struct kobject *kobj, { 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); return sysfs_emit(buf, "%ld\n", general_profit); -- 2.45.0