From patchwork Tue Jun 13 16:09:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13279024 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 6297AEB64D9 for ; Tue, 13 Jun 2023 16:10:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B234D6B0080; Tue, 13 Jun 2023 12:10:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AD44B6B0081; Tue, 13 Jun 2023 12:10:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 99EA58E0002; Tue, 13 Jun 2023 12:10:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 8540D6B0080 for ; Tue, 13 Jun 2023 12:10:08 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4A9F1AFB5A for ; Tue, 13 Jun 2023 16:10:08 +0000 (UTC) X-FDA: 80898211296.28.551A5D2 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf07.hostedemail.com (Postfix) with ESMTP id 7B50C4003B for ; Tue, 13 Jun 2023 16:10:06 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686672606; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/LrWKGbrKOZ8XZhunsfnuO9D+E/u1un+phE47f0SpRU=; b=3ULTUgegX0vC8Xh0u4NvwpZSQ2UgJYraxNTvAKd+oTwLhF9tblE9UCQiJg7aQtf5d3rief ps9Ytb8GizXJf5TxJWoN8XgpcagAWEB3FGCqg/k9YkJW5l8cpywIpJyqf0aRkzIf3PCNvV DSw/6iKWjUbVubvWic/8CG0vGghPcxo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686672606; a=rsa-sha256; cv=none; b=X5+g70T9rcIEYhbpjnpfLefQXRvp/zPaGMkwpXrOt21iqZsamJC2+NU2dyfrAh2Tnb7hoA lOhzDFNLZhl0GmOuN7YD1IOr5uZpcQ4zn5l5maPlBJ+k4uRom/M1WaE8ha7WHtmZdLzNE3 mr6v8/b0M4Eagu0mllIi0MBrjxIUMNQ= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2B482143D; Tue, 13 Jun 2023 09:10:50 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E80413F5A1; Tue, 13 Jun 2023 09:10:03 -0700 (PDT) From: Ryan Roberts To: Jonathan Corbet , Andrew Morton , "Matthew Wilcox (Oracle)" , Yu Zhao Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 2/2] mm: /proc/pid/smaps: Report contpte mappings Date: Tue, 13 Jun 2023 17:09:50 +0100 Message-Id: <20230613160950.3554675-3-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230613160950.3554675-1-ryan.roberts@arm.com> References: <20230613160950.3554675-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7B50C4003B X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: cf91c86oxzsorgmhspp595y19ntrrn6k X-HE-Tag: 1686672606-951674 X-HE-Meta: U2FsdGVkX19idNFkhz7Nfnvzm+OMyOUd9cPR9Qk6eunrroV2ybsUeGeXwZljpI1/mFl9wloHT/sUX+nCy75XCyrAznUBvgWoYKp2f0v6g3C1LH9RCMARvvaOLDvw0kn6TIvtjqkku8MqGMKGJJfQDFQqXOrDVyElbUdMj2+DJAkzD/4GBxDqdPRil64tVXUYhfbonrGCGZCAzTmsiHGfMd4x6vbVOkg3Nfm5UqUCuvReKWnfUm9w8hwcooj+nUayo01GUSe+9XutNzLnNeJ7/94x2dBVpu+ZsFl08ioOk44pKU8RAZKywl/ooFjQj0lLC+tBjkYddKPJdBCpnnG2XeLlQpfMRBtgpsnajaUoQPMvTUnqit6utgQcPvlUdYAGty8FoSq/rtbK9/EpTPm6eL8bmH34pSnC5K9tE29cvyofb6urOgFUFKLbawIgy1o6AL5HRN5Pp+nH/sF9hBFYVAhNlzrBLAK+VhbhKWZl7bfMe63ZDQ/tug2taIXiMyzatFt6Ca9z5Komh4/xLYyFchKnoESIY/k+lneOav9Yia7uPalOw0hubL2Vp8COG0sLWt5pu346pq4Ev+DaKU6KW9QfOHo1hroPcZlfBekbqVExKrLvoWBkMrpvG86PP0BmEv5bCxHnm84VbPAQ0f2OVkKwFL1zzu1dR54BUSfe0tk88rx+ojo33eBAcnKQkaCJEVw3uIkJvKJtTN9NWzt+EEEqbCjovCeaque4QuRumRjO5MQojF+tLmL6c0101kk96zF/J/oO+yldokET1W2qSidwNtP3sDqBcIBnInGwmEuWOZAiKMfVC2HnZ5FUwlTFs7Nn8OdIX33XU5MMeF1wpZm+MsoPEIqto1mr76aVzhIX5XqbIfM2Z73iW1L2W6Oy0CXh5eU6ovZAkd+Tz78wMPcsy5fVX/7N7OuT35i6PV8+EFy/X4Cr5EN7GrYv/qAuVBiObw3ODdGb8JYbDSC 1SyGCGpz X65W5hwqWPkU4pY3zWuQZGY06ZDntkVP0Nq6BQva3u7UpyvoH49Ivt0jcpmmzf0rn+crngN+qVRwzsvbuT2HA8Cw26n3tNvZxZKDuZNaxa8trW4ynNqtUlRaywdCSl6nZ7qNN6kdkO843R0/IWB3qGstdX6Or5FHi11qq 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: arm64 intends to start using its "contpte" bit in pgtables more frequently, and therefore it would be useful to know how well utilised it is in order to help diagnose and fix performance issues. Add "ContPTEMapped" field, which shows how much of the rss is mapped using contptes. For architectures that do not support contpte mappings (as determined by pte_cont() not being defined) the field will be suppressed. Rollup Example: aaaac5150000-ffffccf07000 ---p 00000000 00:00 0 [rollup] Rss: 11504 kB ... ContPTEMapped: 6848 kB Signed-off-by: Ryan Roberts --- Documentation/filesystems/proc.rst | 5 +++++ fs/proc/task_mmu.c | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 5fa3f638848d..726951374c57 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -491,6 +491,7 @@ Memory Area, or VMA) there is a series of lines such as the following:: FileCont512K: 0 kB FileCont1M: 0 kB FileCont2M: 0 kB + ContPTEMapped: 0 kB THPeligible: 0 VmFlags: rd ex mr mw me dw @@ -550,6 +551,10 @@ pmd size. Therefore the exact set of keys will vary by platform. It only includes pte-mapped memory and reports on anonymous and file-backed memory separately. +"ContPTEMapped" is only present for architectures that support indicating a set +of contiguously mapped ptes in their page tables. In this case, it indicates +how much of the memory is currently mapped using contpte mappings. + "THPeligible" indicates whether the mapping is eligible for allocating THP pages as well as the THP is PMD mappable or not - 1 if true, 0 otherwise. It just shows the current status. diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 29fee5b7b00b..0ebd6eb7efd4 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -465,6 +465,7 @@ struct mem_size_stats { unsigned long anon_cont[CONT_ORDER_MAX + 1]; unsigned long file_cont[CONT_ORDER_MAX + 1]; struct cont_accumulator cacc; + unsigned long contpte_mapped; }; static void cacc_init(struct mem_size_stats *mss) @@ -548,7 +549,7 @@ static void smaps_page_accumulate(struct mem_size_stats *mss, static void smaps_account(struct mem_size_stats *mss, struct page *page, bool compound, bool young, bool dirty, bool locked, - bool migration) + bool migration, bool contpte) { int i, nr = compound ? compound_nr(page) : 1; unsigned long size = nr * PAGE_SIZE; @@ -572,6 +573,10 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page, if (!compound) cacc_accumulate(mss, page); + /* Accumulate all the pages that are part of a contpte. */ + if (contpte) + mss->contpte_mapped += size; + /* * Then accumulate quantities that may depend on sharing, or that may * differ page-by-page. @@ -636,13 +641,16 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, struct vm_area_struct *vma = walk->vma; bool locked = !!(vma->vm_flags & VM_LOCKED); struct page *page = NULL; - bool migration = false, young = false, dirty = false; + bool migration = false, young = false, dirty = false, cont = false; pte_t ptent = ptep_get(pte); if (pte_present(ptent)) { page = vm_normal_page(vma, addr, ptent); young = pte_young(ptent); dirty = pte_dirty(ptent); +#ifdef pte_cont + cont = pte_cont(ptent); +#endif } else if (is_swap_pte(ptent)) { swp_entry_t swpent = pte_to_swp_entry(ptent); @@ -672,7 +680,7 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, if (!page) return; - smaps_account(mss, page, false, young, dirty, locked, migration); + smaps_account(mss, page, false, young, dirty, locked, migration, cont); } #ifdef CONFIG_TRANSPARENT_HUGEPAGE @@ -708,7 +716,7 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr, mss->file_thp += HPAGE_PMD_SIZE; smaps_account(mss, page, true, pmd_young(*pmd), pmd_dirty(*pmd), - locked, migration); + locked, migration, false); } #else static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr, @@ -964,6 +972,9 @@ static void __show_smap(struct seq_file *m, const struct mem_size_stats *mss, cont_label(i, label), mss->file_cont[i] >> 10); } +#ifdef pte_cont + SEQ_PUT_DEC(" kB\nContPTEMapped: ", mss->contpte_mapped); +#endif seq_puts(m, " kB\n"); }