From patchwork Mon Jun 20 08:12:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Whitchurch X-Patchwork-Id: 12887091 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 76F4FC43334 for ; Mon, 20 Jun 2022 08:13:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D823A6B0071; Mon, 20 Jun 2022 04:13:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D320A8E0002; Mon, 20 Jun 2022 04:13:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C21878E0001; Mon, 20 Jun 2022 04:13:00 -0400 (EDT) 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 B37FD6B0071 for ; Mon, 20 Jun 2022 04:13:00 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7ED9933B2B for ; Mon, 20 Jun 2022 08:13:00 +0000 (UTC) X-FDA: 79597898520.16.DC89E0F Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by imf06.hostedemail.com (Postfix) with ESMTP id A44F71800A9 for ; Mon, 20 Jun 2022 08:12:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1655712779; x=1687248779; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=gZFTepVCVuUiqVxMVdZ46Oj4Iz+xt4uwly/OdoZth3I=; b=WgwO55IxWY39e7ZQS3r873mQuz1hH3/q/ZhXZJrFM/YznVXob1sAPZE9 kf/UQXPkNGsnhwHfCTybM4nb+RJ1z6WujBGiLOi2xbW90LG6ncFmKHomm IF6BSrin4qQWjW+IMGORZaSrrKA1aBKXQsYzt2cRUi855WaawRiSdO+PC Ry1RreBWfnlwokcaYtJjOUUBln1fceNvlY6CWcAo/xrjeNLSuBzMvt5eR 1s/tf/QvlBEXBNEf+IoGaejHb+pKjWpxa6zamejCh5C9yQHiDe5sM41kT Nuh2WMu6kxsrrDR4VbyZNWXuBs00HJXJapJDOazAOkCdUO+hgWBFHIfDQ g==; From: Vincent Whitchurch To: , Jonathan Corbet CC: , , Vincent Whitchurch , , , Subject: [PATCH v2] mm/smaps: add Pss_Dirty Date: Mon, 20 Jun 2022 10:12:50 +0200 Message-ID: <20220620081251.2928103-1-vincent.whitchurch@axis.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655712780; a=rsa-sha256; cv=none; b=bXAEy3vrrcErVsbu8W/jgjVdw+eWE4cllpq8MPQJSJ+9Tp152ombDzC6pdX6AXI7u1E3DH F4wN3PDdFxU4XY1wFxa47dK9oYcGxDnngz3h+GhAp49Hme2r5v7ay2L0ZAAs+DJG2nn0CU URmPomU255aPGvUPu/otn7qTcWIveig= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=axis.com header.s=axis-central1 header.b=WgwO55Ix; dmarc=pass (policy=none) header.from=axis.com; spf=pass (imf06.hostedemail.com: domain of Vincent.Whitchurch@axis.com designates 195.60.68.17 as permitted sender) smtp.mailfrom=Vincent.Whitchurch@axis.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655712780; 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: references:dkim-signature; bh=gZFTepVCVuUiqVxMVdZ46Oj4Iz+xt4uwly/OdoZth3I=; b=qO2A+v0+iFVpfwZC1zHJFQeDOEKkYjqyqYUu2wlxuZGYmeLTqqdXIbsWP1Iz/nUBoM+f1d nKlJujQ2FFW8IzWmXWtbV8jrBQzcW0UhK7eY+TCU9ej2PWZLexfhnnTNouXZVEECuXqfGu LYahTc4U6ZwMppawMQIPwix1XdE3KvU= X-Rspamd-Server: rspam01 X-Rspam-User: Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=axis.com header.s=axis-central1 header.b=WgwO55Ix; dmarc=pass (policy=none) header.from=axis.com; spf=pass (imf06.hostedemail.com: domain of Vincent.Whitchurch@axis.com designates 195.60.68.17 as permitted sender) smtp.mailfrom=Vincent.Whitchurch@axis.com X-Stat-Signature: znpd151xchn5zj8wnq63pr8p96mii53j X-Rspamd-Queue-Id: A44F71800A9 X-HE-Tag: 1655712779-664834 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: Pss is the sum of the sizes of clean and dirty private pages, and the proportional sizes of clean and dirty shared pages: Private = Private_Dirty + Private_Clean Shared_Proportional = Shared_Dirty_Proportional + Shared_Clean_Proportional Pss = Private + Shared_Proportional The Shared*Proportional fields are not present in smaps, so it is not always possible to determine how much of the Pss is from dirty pages and how much is from clean pages. This information can be useful for measuring memory usage for the purpose of optimisation, since clean pages can usually be discarded by the kernel immediately while dirty pages cannot. The smaps routines in the kernel already have access to this data, so add a Pss_Dirty to show it to userspace. Pss_Clean is not added since it can be calculated from Pss and Pss_Dirty. Signed-off-by: Vincent Whitchurch --- Documentation/ABI/testing/procfs-smaps_rollup | 1 + Documentation/filesystems/proc.rst | 5 ++++- fs/proc/task_mmu.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/procfs-smaps_rollup b/Documentation/ABI/testing/procfs-smaps_rollup index a4e31c465194..b446a7154a1b 100644 --- a/Documentation/ABI/testing/procfs-smaps_rollup +++ b/Documentation/ABI/testing/procfs-smaps_rollup @@ -22,6 +22,7 @@ Description: MMUPageSize: 4 kB Rss: 884 kB Pss: 385 kB + Pss_Dirty: 68 kB Pss_Anon: 301 kB Pss_File: 80 kB Pss_Shmem: 4 kB diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 1bc91fb8c321..f7dce062548f 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -448,6 +448,7 @@ Memory Area, or VMA) there is a series of lines such as the following:: MMUPageSize: 4 kB Rss: 892 kB Pss: 374 kB + Pss_Dirty: 0 kB Shared_Clean: 892 kB Shared_Dirty: 0 kB Private_Clean: 0 kB @@ -479,7 +480,9 @@ dirty shared and private pages in the mapping. The "proportional set size" (PSS) of a process is the count of pages it has in memory, where each page is divided by the number of processes sharing it. So if a process has 1000 pages all to itself, and 1000 shared with one other -process, its PSS will be 1500. +process, its PSS will be 1500. "Pss_Dirty" is the portion of PSS which +consists of dirty pages. ("Pss_Clean" is not included, but it can be +calculated by subtracting "Pss_Dirty" from "Pss".) Note that even a page which is part of a MAP_SHARED mapping, but has only a single pte mapped, i.e. is currently used by only one process, is accounted diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 2d04e3470d4c..751c19d5bfdd 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -406,6 +406,7 @@ struct mem_size_stats { u64 pss_anon; u64 pss_file; u64 pss_shmem; + u64 pss_dirty; u64 pss_locked; u64 swap_pss; }; @@ -427,6 +428,7 @@ static void smaps_page_accumulate(struct mem_size_stats *mss, mss->pss_locked += pss; if (dirty || PageDirty(page)) { + mss->pss_dirty += pss; if (private) mss->private_dirty += size; else @@ -808,6 +810,7 @@ static void __show_smap(struct seq_file *m, const struct mem_size_stats *mss, { SEQ_PUT_DEC("Rss: ", mss->resident); SEQ_PUT_DEC(" kB\nPss: ", mss->pss >> PSS_SHIFT); + SEQ_PUT_DEC(" kB\nPss_Dirty: ", mss->pss_dirty >> PSS_SHIFT); if (rollup_mode) { /* * These are meaningful only for smaps_rollup, otherwise two of