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 17D25C4167B for ; Mon, 26 Dec 2022 02:06:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 98EE4940008; Sun, 25 Dec 2022 21:06:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 93F48900002; Sun, 25 Dec 2022 21:06:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82EC2940008; Sun, 25 Dec 2022 21:06:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 73878900002 for ; Sun, 25 Dec 2022 21:06:09 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3EA411C4472 for ; Mon, 26 Dec 2022 02:06:09 +0000 (UTC) X-FDA: 80282817258.22.8C4A668 Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by imf22.hostedemail.com (Postfix) with ESMTP id 9F81DC000C for ; Mon, 26 Dec 2022 02:06:06 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf22.hostedemail.com: domain of yang.yang29@zte.com.cn designates 183.62.165.209 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672020367; 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=0e98/MKwqcuwIVV5LBEnxmtT1/kAVs7NTPIMztvTxQ8=; b=XhDwEA89hn2dfABawZkObi+CloTjw2rW2umpXwZw+dSyM3Jkr0XXGA8zmIZat3Jm+36b72 KHb/UI3NZOL5MPWffxb9jLY3LBOFgstay5El7RkfjBSvFbB8u8aq4zGEppTiijIafvceTw u2d0g98NmAJfDxYXKAxHrif3e/ZooHE= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf22.hostedemail.com: domain of yang.yang29@zte.com.cn designates 183.62.165.209 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672020367; a=rsa-sha256; cv=none; b=cOqz3tkscNql6EkQG0xjoEvNpeg7th920Bzeg9u2EYE4VnMGt1NjDokGpbu1HDp+HybS1+ GxxLskfQIDssiWpmtdT44ZJ9Avvicf1/b6saE0nZ8xGGEj3XgXnU2bGrQkazlfCIqJsFip ID0X1Q+N02AsPBNZezYWKZRchPIS17E= Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4NgLjl6hXqz4xpyB; Mon, 26 Dec 2022 10:06:03 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl1.zte.com.cn with SMTP id 2BQ25poD056061; Mon, 26 Dec 2022 10:05:51 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Mon, 26 Dec 2022 10:05:52 +0800 (CST) Date: Mon, 26 Dec 2022 10:05:52 +0800 (CST) X-Zmail-TransId: 2b0363a90180ffffffff8da76b70 X-Mailer: Zmail v1.0 Message-ID: <202212261005526160207@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , Subject: =?UTF-8?B?W1BBVENIIHY0IDQvNl0ga3NtOiBjb3VudCB6ZXJvIHBhZ2VzIGZvciBlYWNoIHByb2Nlc3M=?= Content-Type: text/plain; charset="UTF-8" X-MAIL:mse-fl1.zte.com.cn 2BQ25poD056061 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.251.13.novalocal with ID 63A9018B.002 by FangMail milter! X-FangMail-Envelope: 1672020363/4NgLjl6hXqz4xpyB/63A9018B.002/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63A9018B.002/4NgLjl6hXqz4xpyB X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 9F81DC000C X-Stat-Signature: sk1myq1d9uwohcnsbs4wwxd7aomw9zdo X-HE-Tag: 1672020366-141372 X-HE-Meta: U2FsdGVkX1/tc9BIKiPuaU/Jxr0ov+6leu3ILAhNTshoVozeVYmPlyXuB6Bx20lHXfEIxA2D37oY44muwCAUoC/cKZFHx/9EYFRSyOMa/rT6aen/aDi18Qep7KMkK/yBPcEFzNRbjJ1VF3dXFQxpbCqOsCfUw1/373jD4NS4WUUZvGCIGIGmDHe2fYCbAiObq70l2dg/SQQShQo6U0kSqYny1LGEtsZwLr4UrHBqM4+HDbIl/Q2edC/61tluaZQh916KH6kYDCnNFMjMGekzqK8y0iTcaFMr9HW3xrVEjRc/oiRKdUVYi3XVR/LkEdbx0jATAxaVN3H7ll6PL84gK3W8Q2I9Z487J8XKN778yMRBu8BM8wrsPWq/mRmnb0locnsq3HFUajJi2gidcUPCQ3gj0UV2SuFncY3oNNSdfd5p8sMsS3CrY+T72fNnrqbsYHUgXrcKqGgwRb4LraHsJvLtD5ak3O9shChQ8dOXYV0xP5CrkiLGs1+HCfCf5HlEaMvZfHLXn/buCvk402yhxeEMiTUo0OqErZknBBE2r8D1rwkVMburkZ/AlJPDU66eHwFGzd+WG6weO7ZGV0lE+VfQ5l2i6A1P4nngiAYi/JrCmuJq8tt1Yx9iYnVcTOKgzl8PS4bx0LTwfTEEdQCYnT0re+f710LzIJ46oA5LL/CSS9jsf+78n0vP6IiDc2BKUso5PktN93TJv0j6T/NJcgTeL8a9mHYk2eE8zdaKbgeB7CnS/ZBvoNALChynfZlwy9QP/ZaMpo3AX56RtKsm2VATjUnxMycoh78VM+XBfuZWe645lJuI5iVxuIVb+HQP/AQJ2g0I2xiRMMqTI7zfmp6G8TkNmJ6FOCF/HdYK1mcykkCUhm82G56udKEHfN5Ki83G1eTC6WuXEx805PqtzvK58oYMIl9rLWmBYxdoPt8= 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 3b8475007734..9081cfe89d6f 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 e02cc89512cd..6eb85de7b69f 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