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 38FBCC636D4 for ; Fri, 10 Feb 2023 01:20:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA1CA6B00C8; Thu, 9 Feb 2023 20:20:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C78AE6B00C9; Thu, 9 Feb 2023 20:20:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B68786B00CA; Thu, 9 Feb 2023 20:20:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A563D6B00C8 for ; Thu, 9 Feb 2023 20:20:09 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 77A371209EE for ; Fri, 10 Feb 2023 01:20:09 +0000 (UTC) X-FDA: 80449626138.26.04D6B40 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by imf18.hostedemail.com (Postfix) with ESMTP id 9B8A21C000F for ; Fri, 10 Feb 2023 01:20:06 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of yang.yang29@zte.com.cn designates 63.216.63.40 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn; dmarc=pass (policy=none) header.from=zte.com.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675992007; a=rsa-sha256; cv=none; b=FsfSzx3wJi/ttUSEkysETq7CjSHmWr8zz7Y6Pt0Fuyb5fB7+4rVFoJTc9vMbQNkKT67wBv 3LbgXADRBptFPLUpgpfUH8IqmYm2n3BzEmY2lfGhFeirdhcukKRaajr2LY9k2b9LTYJbCO Tv2dSpSDlrduW/IRfOEmsDnmqTKijEM= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of yang.yang29@zte.com.cn designates 63.216.63.40 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn; dmarc=pass (policy=none) header.from=zte.com.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675992007; 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:in-reply-to: references; bh=kYr5WVQqOlA4UGoUEmtACqMpk4wQYhe20dijyYWJccU=; b=cMqN6xFoc+0ZhPUraMQykJLlmXvHciRbY2tUezBkD2xXkFVhyxZVemIgGM2kv/N1aNdZfT QijcxR4Sr7Wg279xddW18ko0CVp2aYIs4v6H5X9efVGpIDqY61qgUlKHw1H/r5T3qvcCZP SzmtpCcDUwxfxb1M1zewuzA/UecMW9c= Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4PCbWR6Qvjz8R042; Fri, 10 Feb 2023 09:20:03 +0800 (CST) Received: from szxlzmapp02.zte.com.cn ([10.5.231.79]) by mse-fl2.zte.com.cn with SMTP id 31A1JmBv024052; Fri, 10 Feb 2023 09:19:48 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Fri, 10 Feb 2023 09:19:49 +0800 (CST) Date: Fri, 10 Feb 2023 09:19:49 +0800 (CST) X-Zmail-TransId: 2b0363e59bb508349ce2 X-Mailer: Zmail v1.0 Message-ID: <202302100919492571517@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , Subject: =?UTF-8?B?W1BBVENIIHY2IDQvNl0ga3NtOiBjb3VudCB6ZXJvIHBhZ2VzIGZvciBlYWNoIHByb2Nlc3M=?= Content-Type: text/plain; charset="UTF-8" X-MAIL:mse-fl2.zte.com.cn 31A1JmBv024052 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 63E59BC3.000 by FangMail milter! X-FangMail-Envelope: 1675992003/4PCbWR6Qvjz8R042/63E59BC3.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63E59BC3.000/4PCbWR6Qvjz8R042 X-Rspam-User: X-Rspamd-Queue-Id: 9B8A21C000F X-Rspamd-Server: rspam01 X-Stat-Signature: a1or17qa1djohhdwu4wqodqugtxfufhq X-HE-Tag: 1675992006-960831 X-HE-Meta: U2FsdGVkX19lDVbDo9ol9V21oHfduNgNJCKnz3vg8XZpntXjUZXol76Sbn0fh1fJhig1MOEuHHMlMccMTgVAx4Tj4f9HLxxHC4nlGB2FmsqHFxH7aSQplIxW6NH2kUSynEWSHTIM+wLm/fyU+oq5vNLc5qOGslOD9BFyfGzuv63eznM0oZbmf1T8ixZjotnR5Pr+s/5eXBlgMQ0jqH/mZPCSIO9iU5wtOjyR2LzhLlq7ReJuf4j+ERmHvik3My7IJAdD14hTgdu5OFXpFduJ0tePVZ9qUa2nw/i4kYeS/3tN5jHA5OwLuc4WRkQ7PS0CIH+oheSnCld8WkgCp/GZAg4NYRQsPQbq2kwsUui+q1TS53ILLKGJqtXS9Xi6Y6c8DKw/U3TL+fg79IiQo2epGGkGQnY97jcEx6Xc+7sRGmzg1LGwAg42zTuYrWI+fFwn/bgP8a2rXoG0LLnVeUH61ZRqPUBC6cCnXfdK3pW5mapajrLlT8E5zW291U6bOQ76l4as9z12/FsdH245VnAhqe/09p1RDqgb/XGawhlc+zWK28zynMhA4kq4Yc0oejsiWuHBbbj3/Fz5WaybrbCEYu6Lo0Hkxc2BC6JBYG0/W5IG9R6XF9KYn02BTPcOX0znsajUohxvdaFGLBfY5P/oQcH/q3japPN3RoA1Lvvz+ceNamp0XsS1+BCTA7ZVOmOLY7oTY5/iHBZdoh3I5/lxhvWbXn/HoVnby6YMEwVkH3Mh9BZ2uAl51FbZThG7y2eQLqsCmUr4L2rtUOJm+B2AHOKwIS/RW1KXR1dTB3wXJ4HjRhz+MyatkTQLBIv+oD6gyc7uJRkJP6u2kkrq12UUDmHF/86oT+FMKGPiT/+a5KkgiV5q32ZEhj3ww74aoz+j8EeTx1o4yOGfstzx/AtpVNm+qoHkAwuni8+kZ6WJmlC7SQFd9kQNvegLKaNAJFnHLIEmDXcjh+Q7kaxBolE NjUUlUuy uSWDWD27qZgQyEQPjFEKGGpJqJzSojYWyuN1wClvfuEJoKufT7n47n3hPNR6EoNYSSBUiD3C+aIyR8YkreqNhUkbAoh25FeA0qE049CdcCGAE8gkbTcBsZ4PaUS1I4sOtIa5RXVWw4MpUHy7TWcKf6sGoWJBp/j2ZI3m4KYEBSX5XRfe4H+rGgq8UAkg7l6jYhLg70gXHYrRRlM/REXVglspvmPYwfsO/gW0w9YqdMelRMzx5cYOxKrXDIE24pN/d9H9S0gaFd0BZx7XS9RLs2d0Yk2T3IdetLx4IZ9dlj8ddTY1fn0I7SbMdVOPWVFRqwOG8ff+HXwjz+4VFBRAqRZ78qQ4tedac5l2F 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: From: xu xin 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. 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//ksm_stat, just add the information of zero_pages_sharing in it. Cc: Claudio Imbrenda Cc: David Hildenbrand Cc: Xuexin Jiang Cc: Xiaokai Ran Cc: Yang Yang Signed-off-by: xu xin --- fs/proc/base.c | 1 + include/linux/mm_types.h | 7 ++++++- mm/ksm.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 9e479d7d202b..ac9ebe972be0 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -3207,6 +3207,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, "zero_pages_sharing %lu\n", mm->ksm_zero_pages_sharing); mmput(mm); } diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 4e1031626403..5c734ebc1890 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -776,7 +776,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_sharing). */ unsigned long ksm_merging_pages; /* @@ -784,6 +784,11 @@ struct mm_struct { * including merged and not merged. */ unsigned long ksm_rmap_items; + /* + * Represent how many empty pages are merged with kernel zero + * pages when enabling KSM use_zero_pages. + */ + unsigned long ksm_zero_pages_sharing; #endif #ifdef CONFIG_LRU_GEN struct { diff --git a/mm/ksm.c b/mm/ksm.c index 1fa668e1fe82..42dbcc3ec90d 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -794,6 +794,7 @@ static inline void clean_rmap_item_zero_flag(struct ksm_rmap_item *rmap_item) { if (rmap_item->address & ZERO_PAGE_FLAG) { ksm_zero_pages_sharing--; + rmap_item->mm->ksm_zero_pages_sharing--; rmap_item->address &= PAGE_MASK; } } @@ -2117,6 +2118,7 @@ static int try_to_merge_with_kernel_zero_page(struct ksm_rmap_item *rmap_item, if (!err) { rmap_item->address |= ZERO_PAGE_FLAG; ksm_zero_pages_sharing++; + rmap_item->mm->ksm_zero_pages_sharing++; } } else { /* If the vma is out of date, we do not need to continue. */ -- 2.15.2