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 61FA0C25B5F for ; Wed, 8 May 2024 09:56:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E2E8E6B010F; Wed, 8 May 2024 05:56:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DDF396B0111; Wed, 8 May 2024 05:56:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA6CC6B0112; Wed, 8 May 2024 05:56:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id AA2DA6B010F for ; Wed, 8 May 2024 05:56:35 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 080891C0C2D for ; Wed, 8 May 2024 09:56:35 +0000 (UTC) X-FDA: 82094773950.28.DCADDCE Received: from out-181.mta1.migadu.com (out-181.mta1.migadu.com [95.215.58.181]) by imf27.hostedemail.com (Postfix) with ESMTP id 18F6F40005 for ; Wed, 8 May 2024 09:56:32 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sOWryHtG; spf=pass (imf27.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.181 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715162193; 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=2bLQ4gptvM3L1QRVzQ/kljeJWLtVefD+oipqeUeshP8=; b=y7LLGli1LErPJ5M712VXH/Jr+KCLV69AnFXDMnM9R165RFHyl28jonILHoDTdr2XE5uXj+ RK2caAFrkb1yGudlPDwxdVYP3ju30pbAm5QoQqRsN9fVdnxFDPJLr37MWZpHsu3BEj3Ouq rNJDkPXZ8FLrEaPffBulriJ9LYjHv80= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sOWryHtG; spf=pass (imf27.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.181 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715162193; a=rsa-sha256; cv=none; b=WDYO1AlMfORQt6U72r2A3Kq0C6UbroO7spn0ITYTcQimv+eOoM19aOXFF3PbYOFlXT9dKh GB15MyuR0kGMNLMWhEyp53N8fEnmoazYddTtht77ZsutwV21i2tWoFO+2AZCvM7B5+l+Jc qrM2nNw3uYulTZwdzOKLJ46Gs9gP3Qo= 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=1715162191; 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=2bLQ4gptvM3L1QRVzQ/kljeJWLtVefD+oipqeUeshP8=; b=sOWryHtG3kXzk2QHXqC3vWzkFP+FlHnR4lQWZKayTg4D2xGZnkjYjf+0j5aWmIgXNvd7zT 2QTe1nDeX5MKcr4QGAkBy3rzDwzo0dDxHfeOb8oJM+xxOXS9rkqgLYVByDvnSqwIxXy2bs iLs3tqru3cEhRFU15/Fg6ROIvd2+Gv8= From: Chengming Zhou Date: Wed, 08 May 2024 17:55:39 +0800 Subject: [PATCH 2/4] mm/ksm: fix ksm_zero_pages accounting MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240508-b4-ksm-counters-v1-2-e2a9b13f70c5@linux.dev> References: <20240508-b4-ksm-counters-v1-0-e2a9b13f70c5@linux.dev> In-Reply-To: <20240508-b4-ksm-counters-v1-0-e2a9b13f70c5@linux.dev> To: Andrew Morton , David Hildenbrand , 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=1715162174; l=4898; i=chengming.zhou@linux.dev; s=20240508; h=from:subject:message-id; bh=zT3260cOojJ9YkJT42xnisTrezwzaldkD24iYYJXwwo=; b=pw9F/6MfqwjmEILvTY9Kw8kVwDgxLbZH1bNRvo778ZsSVX+2PHfvvqg43hSoNnMZZzZZRsU89 AoIeAp0psC8AQfATubxnDjo3cEl5nWUpcfboQr/FSoASz3WAK8siagH X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=kx40VUetZeR6MuiqrM7kPCcGakk1md0Az5qHwb6gBdU= X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Queue-Id: 18F6F40005 X-Rspamd-Server: rspam06 X-Stat-Signature: ojpxez3zonj1xsxxsxcjzf8979cti6bm X-HE-Tag: 1715162192-624886 X-HE-Meta: U2FsdGVkX19LCkf4/a352VhpVOrKvv/yz6r3j/HUUNfoXD2FfASk4tUIn6q+XsE2wI6gQMXOC+m+zrfeXjqH22BYAdTtI8+SUJC0qH9aI+RsSmf3YCL6PP8NUlXozhSznVuJ8t69H40jkv/QRyQPA8eQboCpqa9BHBsYYi32X7TlOmliB5cVN/3W7q9mPwlqMPTi/mnQivQvuB3A08k/2V6wPjJvWSl6vprWa4xSV0yM8LIBMPiAlnEMOphll4MCykY42e19TCV1Oa8ncoaJ0joabJZj5+/56nNc6U37iYOdp+90NXUCvp7qwij/9eUkEXiHdythghyAm1BdCiFr4R1pyeLouEsXQvTqn9j8Vawl0SWT/8PRgpDeb2uHlZkc08LUpprMZKrb1PV4TinGl5EJBhRtfhmskZcJKuhsotUtdeod+eb+q3VNv+nnCLUpooiqBbzuQ2OiRUtCtkek+5sTDfk6SZ6M0BhLBSaM66fCZFMNo/Tn1vwkrAuZqWggROSGFkkvuKuGR3dUikrPdsZq6ILMxJQHsm9OP/W+0RdywmdRRpwusgWlLJus2hvSJXwAgTfHDA3AbQILKJ1dS0qhZrOzSq95Hz2TSAEb+HJr/07/7Ilavrs4kMuSTuoAyxI62aHX7EJb89bzHoBq4KbnmdO+fBRtQuI2/+7IcKurT+FPLe78c96U3UHN9oYdrKmwfNREOqkHUd7eQvCSZeT2gpbAQ1LMmr6nntTv+Nh+iGA9ptLWAEVgpa+OiuTyImNykg9lRoB9IBuDJbR3nvfKmDDypmt3GEHiWPEYHv30H4hf1beY1mHCQlUl01qH50StGuBn1P8LmY2Vdvl12v20+Wujad94RW0iCAl0sZwpOrzB/+3RELh4SMxHZdIBZrzgJIhSBMwKC9/6yajxNVtZ8KfYG0o+swATwNak07zxAaz235LC1RzIMRv9LCeFStV6gM4xYF2BXzKXeDg n9YW8/A0 HlCDb3vQVHZyn/v7V8KnRq8277hDOk7P3ftFd0cDpxtTvIoF0j+Onr3qQmU2cEZ8VjY0zmn/xMHmXuiWv0mm8LhuHM7OURH44y4LY3avNvzNM/lQUZT2yyDYVdSbl+uEqKMHd 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. Signed-off-by: Chengming Zhou --- fs/proc/base.c | 2 +- include/linux/ksm.h | 22 +++++++++++++++++++--- include/linux/mm_types.h | 2 +- mm/ksm.c | 11 +++++------ 4 files changed, 26 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..bfc2cf756b0d 100644 --- a/include/linux/ksm.h +++ b/include/linux/ksm.h @@ -33,16 +33,32 @@ 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 get_ksm_zero_pages(void) +{ + return atomic_long_read(&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..6e0dca3cecf3 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", get_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 + get_ksm_zero_pages()) * PAGE_SIZE - ksm_rmap_items * sizeof(struct ksm_rmap_item); return sysfs_emit(buf, "%ld\n", general_profit); -- 2.45.0