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 C8F0EC53210 for ; Thu, 5 Jan 2023 10:19:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 611CA94001F; Thu, 5 Jan 2023 05:19:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5497F940008; Thu, 5 Jan 2023 05:19:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C30494001F; Thu, 5 Jan 2023 05:19:52 -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 2BB39940008 for ; Thu, 5 Jan 2023 05:19:52 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 08367140D99 for ; Thu, 5 Jan 2023 10:19:52 +0000 (UTC) X-FDA: 80320349424.02.54EA7BC Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf02.hostedemail.com (Postfix) with ESMTP id 70D638000F for ; Thu, 5 Jan 2023 10:19:50 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="U/UY/aBZ"; spf=pass (imf02.hostedemail.com: domain of 3RaS2YwoKCIwz9x4Awx943w44w1u.s421y3AD-220Bqs0.47w@flex--jthoughton.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3RaS2YwoKCIwz9x4Awx943w44w1u.s421y3AD-220Bqs0.47w@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672913990; 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:in-reply-to:references:references:dkim-signature; bh=YROC31bBHQbBSjmgrEGHhxpa+rSAT6KfqkSaFQ7ab5I=; b=C3TfqnKLaP0JFBqM1tuSY5helaEOKy4XlTAp655d+MYOTt58HCZyAG411zopyJk3baoz/2 L/pkGPAWwAHAGeHiQBy6SNYm04emlibm7OtufhhtMbM/4Sq2zVVZfC7B8XmMtBmlHzztuD dqOS84gqR41yThk1NERnegModxbTRMk= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="U/UY/aBZ"; spf=pass (imf02.hostedemail.com: domain of 3RaS2YwoKCIwz9x4Awx943w44w1u.s421y3AD-220Bqs0.47w@flex--jthoughton.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3RaS2YwoKCIwz9x4Awx943w44w1u.s421y3AD-220Bqs0.47w@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672913990; a=rsa-sha256; cv=none; b=ol8Pr5WjTJSTJ1I6cigKvqdOcLkmy8/WsbyVrLlTTcTFUegk6OeCyunGLmByPp2I7de5pp WGjoqVYIGdeXu18gWFAenzk+MXb9KyCt7RVPGx+AF75ztX3zPIhnB4XJ94amKb1/p9M/el /p/Mv5eBs14x/JWltEuRVG0Q30e8f7Y= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-45a51c37009so376797657b3.17 for ; Thu, 05 Jan 2023 02:19:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=YROC31bBHQbBSjmgrEGHhxpa+rSAT6KfqkSaFQ7ab5I=; b=U/UY/aBZuBuGO1zBf6hoefUgK67MuUBly/rpc07hnF9u48daPB1OjsNzzcpRAPF19C LuSN2mUnYGUk8rvXyHGEuQtX3iEeJRkKhDrbwW5MY6Wf7TTfUt5oqHr8PuK0ICT4V7Ir G9IYlCVaymyzPUk4ZLkY6wnrdelHelK76kz4YyGJlubRd29SUQWrCXQl5QBNjdcKzI6B +QXWbVZqKiQuB/zZgtBcVlNNhSjJRbffRJg2gp1NzRPUYzXyFHl30sL1lhuUu2N/BaSC x0saMyGSHg8E20qCo+1AtcjQOlOpoSyK4amkpF0avMjdnvn1hlCJtd1I/c5LFWD6iihU /N9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YROC31bBHQbBSjmgrEGHhxpa+rSAT6KfqkSaFQ7ab5I=; b=vadI70g9JxioA+13GFCnTTzQsw7DYyOOLiI7OEsB9UUCDqhrMZmTa3b+o2EpeXkptm oruZ2u9Kdi9fwR2lq+EVzLaI9hE/sl0EhwLQmFyeUTGgFgEdJ891pHOJEySaJnzQBU5t xgi1JCwodYUDvYlMOnkjUo2Kon4EqqjoxGENqgRvbxLM8ETANWyh0iHVsG2XcsjO7UtA W2Hp0+sZSQwTNhfLKtFrpTpcXa2yzCk0I/cBuYloD3wQGAACd6tyHqW9iOgp3R4yLnOd koH9IbqWadh9/6lQXSLwRIcxlRuSat6m6aF/PIgrVBgx/ryHO1arKSOhEAJIW37B9x8h EKew== X-Gm-Message-State: AFqh2koxbzio++1WQPDVan4oOwUMo061/bsq0eflmMPoNgp8CbE8e/QP wUjJloCIc5aH13r/I7P+X3U43Rx7hog/zisn X-Google-Smtp-Source: AMrXdXva/62F1LiNjUZP+w4O7dOJeE1Zyly2AVsZ+dGfpJE6FQgboB0b+h+nC+ToRQ8c3xNeHsE+NI6Dzh0EkPbj X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a0d:e5c3:0:b0:4ba:4d9d:ca0f with SMTP id o186-20020a0de5c3000000b004ba4d9dca0fmr472468ywe.250.1672913989605; Thu, 05 Jan 2023 02:19:49 -0800 (PST) Date: Thu, 5 Jan 2023 10:18:36 +0000 In-Reply-To: <20230105101844.1893104-1-jthoughton@google.com> Mime-Version: 1.0 References: <20230105101844.1893104-1-jthoughton@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230105101844.1893104-39-jthoughton@google.com> Subject: [PATCH 38/46] mm: smaps: add stats for HugeTLB mapping size From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu Cc: David Hildenbrand , David Rientjes , Axel Rasmussen , Mina Almasry , "Zach O'Keefe" , Manish Mishra , Naoya Horiguchi , "Dr . David Alan Gilbert" , "Matthew Wilcox (Oracle)" , Vlastimil Babka , Baolin Wang , Miaohe Lin , Yang Shi , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 70D638000F X-Stat-Signature: 5kh1p6pjfbx6cuenkybw688paq8n4qmj X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1672913990-249457 X-HE-Meta: U2FsdGVkX1+sLcKckZ1qvrB2VfXJESePbQzF2uWambPL0OctwKaV2BGkCpZMQxKljZHqdBMH6bpsnhNspOXnvG+sSJjSa7GfSz0kpwAyFmJ7ne7l3xs9kYvNoHFg7dtweRRii0O7s+XVmMQu0wa8ysEg13qBaSJrqMKXH+u1DoVr/54yKnHwW/ylhMah4OwfgqDUVXuvhVXqBOfTWZm3CCuPMIqj9ZXI+DVDH/F5m0bmmD0v10eSy67RgM1mXKLTrCx5YACnCyVn5L4q3q90yti/ZXLbwsUrGGZA75cygzAWT+McoBmQ5V+QdGg2tP6Q4welYPIg0uSW6GMRd3+4h6z6OOJJ/EG8vJrk3il0V5nd5lYbxQznR21ovsnQf28fvLANM4W6yp6OnAcyXcsUrmNuw+V6NoUmWYnBszFFUfJwCFstNODKfc8/0qO7b90kliPHpZYJTvdhn0+e4it3z300JgDUoa9+NqGa40y2OGzvB91qsM/7jsqNuz/g25+CUW8quq1FYaURmAa0FEMScLf7d3kZ0SVn6S6VbD3rxFEPOD2f+feLmZa8w/VMarYWHlP41JW+jntr0u7Yp3zccuOjdwYXS7XhnvSyBwNJzznQpdCqOji+9ak4djCyCzyH+1OJFx2c5ts1QvlVd6TZ7mdBoubw38wG9x/Q7r6hwJo8mzMI3HyaPKRDUpZyPMiUiMArlQ1C2ZQ7YbCORjVFUJyzay+7c8Z8wD7umpbMQGPIVJv7UtSiK8JLvqfTlSE3f4tEw8Z8joZ7+TPHjp/8nRBrYg/p45Fl9YQvdQHPYJ95Gy5U4n3KMUxqmgnW2oPVfp18ctDAKsRi6m7laOsBdVxvmVR/QxMm/JFvSTV9X77PoaMLg7xyAk4GAP3ymMZYNDydNi8RlUMSmjuNxmXrcZPWYTZkHz6e1fnPt5EWNvwYyPT86lU3+xRcMgN/iiM9VFj4amCpizh1rCagr4B Zrk0jqpk S3o9DIIVldRJQO8aJG/ApQokyv4dhuyoYxmaZaY2iDW7dR9KDPbWpRFtKxsnAbe6aiyyL5onFgIYaYfjxmm+ckc3FBPkzFQBBdJkY9KC9Fe292lubIePLMKpJ9+8SsYZIoKs1W6PxT6f0+gN9LOfVPPrb6cAjx4mmAcNREQsLxZKFvSTyl5Zo8IVW1GEDZuSLg+7OG3LkfbZzjUV1f8VW7Ax7R7TscKs8UytgBm3SoCxMe0cOkGZ0vYiMD+tQdt037D4BKjWpnc3D7/7uMZ8tkuix9Z2pwL0esGUJthlzR09HVQ2u536SNTv9Qmpw5WCCvzJHnNIvdW2yv6cdHnFV46Cs26bPc3qMCmVFLMOZZVRpSbKBMlpstaviyYfAmHZUP3PJdUlfd1Km5Ug= 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: When the kernel is compiled with HUGETLB_HIGH_GRANULARITY_MAPPING, smaps may provide HugetlbPudMapped, HugetlbPmdMapped, and HugetlbPteMapped. Levels that are folded will not be outputted. Signed-off-by: James Houghton --- fs/proc/task_mmu.c | 101 +++++++++++++++++++++++++++++++++------------ 1 file changed, 75 insertions(+), 26 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index c353cab11eee..af31c4d314d2 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -412,6 +412,15 @@ struct mem_size_stats { unsigned long swap; unsigned long shared_hugetlb; unsigned long private_hugetlb; +#ifdef CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING +#ifndef __PAGETABLE_PUD_FOLDED + unsigned long hugetlb_pud_mapped; +#endif +#ifndef __PAGETABLE_PMD_FOLDED + unsigned long hugetlb_pmd_mapped; +#endif + unsigned long hugetlb_pte_mapped; +#endif u64 pss; u64 pss_anon; u64 pss_file; @@ -731,6 +740,35 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) } #ifdef CONFIG_HUGETLB_PAGE + +static void smaps_hugetlb_hgm_account(struct mem_size_stats *mss, + struct hugetlb_pte *hpte) +{ +#ifdef CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING + unsigned long size = hugetlb_pte_size(hpte); + + switch (hpte->level) { +#ifndef __PAGETABLE_PUD_FOLDED + case HUGETLB_LEVEL_PUD: + mss->hugetlb_pud_mapped += size; + break; +#endif +#ifndef __PAGETABLE_PMD_FOLDED + case HUGETLB_LEVEL_PMD: + mss->hugetlb_pmd_mapped += size; + break; +#endif + case HUGETLB_LEVEL_PTE: + mss->hugetlb_pte_mapped += size; + break; + default: + break; + } +#else + return; +#endif /* CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING */ +} + static int smaps_hugetlb_range(struct hugetlb_pte *hpte, unsigned long addr, struct mm_walk *walk) @@ -764,6 +802,8 @@ static int smaps_hugetlb_range(struct hugetlb_pte *hpte, mss->shared_hugetlb += hugetlb_pte_size(hpte); else mss->private_hugetlb += hugetlb_pte_size(hpte); + + smaps_hugetlb_hgm_account(mss, hpte); } return 0; } @@ -833,38 +873,47 @@ static void smap_gather_stats(struct vm_area_struct *vma, static void __show_smap(struct seq_file *m, const struct mem_size_stats *mss, bool rollup_mode) { - 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); + 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 * them are zero, and the other one is the same as Pss. */ - SEQ_PUT_DEC(" kB\nPss_Anon: ", + SEQ_PUT_DEC(" kB\nPss_Anon: ", mss->pss_anon >> PSS_SHIFT); - SEQ_PUT_DEC(" kB\nPss_File: ", + SEQ_PUT_DEC(" kB\nPss_File: ", mss->pss_file >> PSS_SHIFT); - SEQ_PUT_DEC(" kB\nPss_Shmem: ", + SEQ_PUT_DEC(" kB\nPss_Shmem: ", mss->pss_shmem >> PSS_SHIFT); } - SEQ_PUT_DEC(" kB\nShared_Clean: ", mss->shared_clean); - SEQ_PUT_DEC(" kB\nShared_Dirty: ", mss->shared_dirty); - SEQ_PUT_DEC(" kB\nPrivate_Clean: ", mss->private_clean); - SEQ_PUT_DEC(" kB\nPrivate_Dirty: ", mss->private_dirty); - SEQ_PUT_DEC(" kB\nReferenced: ", mss->referenced); - SEQ_PUT_DEC(" kB\nAnonymous: ", mss->anonymous); - SEQ_PUT_DEC(" kB\nLazyFree: ", mss->lazyfree); - SEQ_PUT_DEC(" kB\nAnonHugePages: ", mss->anonymous_thp); - SEQ_PUT_DEC(" kB\nShmemPmdMapped: ", mss->shmem_thp); - SEQ_PUT_DEC(" kB\nFilePmdMapped: ", mss->file_thp); - SEQ_PUT_DEC(" kB\nShared_Hugetlb: ", mss->shared_hugetlb); - seq_put_decimal_ull_width(m, " kB\nPrivate_Hugetlb: ", + SEQ_PUT_DEC(" kB\nShared_Clean: ", mss->shared_clean); + SEQ_PUT_DEC(" kB\nShared_Dirty: ", mss->shared_dirty); + SEQ_PUT_DEC(" kB\nPrivate_Clean: ", mss->private_clean); + SEQ_PUT_DEC(" kB\nPrivate_Dirty: ", mss->private_dirty); + SEQ_PUT_DEC(" kB\nReferenced: ", mss->referenced); + SEQ_PUT_DEC(" kB\nAnonymous: ", mss->anonymous); + SEQ_PUT_DEC(" kB\nLazyFree: ", mss->lazyfree); + SEQ_PUT_DEC(" kB\nAnonHugePages: ", mss->anonymous_thp); + SEQ_PUT_DEC(" kB\nShmemPmdMapped: ", mss->shmem_thp); + SEQ_PUT_DEC(" kB\nFilePmdMapped: ", mss->file_thp); + SEQ_PUT_DEC(" kB\nShared_Hugetlb: ", mss->shared_hugetlb); + seq_put_decimal_ull_width(m, " kB\nPrivate_Hugetlb: ", mss->private_hugetlb >> 10, 7); - SEQ_PUT_DEC(" kB\nSwap: ", mss->swap); - SEQ_PUT_DEC(" kB\nSwapPss: ", +#ifdef CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING +#ifndef __PAGETABLE_PUD_FOLDED + SEQ_PUT_DEC(" kB\nHugetlbPudMapped: ", mss->hugetlb_pud_mapped); +#endif +#ifndef __PAGETABLE_PMD_FOLDED + SEQ_PUT_DEC(" kB\nHugetlbPmdMapped: ", mss->hugetlb_pmd_mapped); +#endif + SEQ_PUT_DEC(" kB\nHugetlbPteMapped: ", mss->hugetlb_pte_mapped); +#endif /* CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING */ + SEQ_PUT_DEC(" kB\nSwap: ", mss->swap); + SEQ_PUT_DEC(" kB\nSwapPss: ", mss->swap_pss >> PSS_SHIFT); - SEQ_PUT_DEC(" kB\nLocked: ", + SEQ_PUT_DEC(" kB\nLocked: ", mss->pss_locked >> PSS_SHIFT); seq_puts(m, " kB\n"); } @@ -880,18 +929,18 @@ static int show_smap(struct seq_file *m, void *v) show_map_vma(m, vma); - SEQ_PUT_DEC("Size: ", vma->vm_end - vma->vm_start); - SEQ_PUT_DEC(" kB\nKernelPageSize: ", vma_kernel_pagesize(vma)); - SEQ_PUT_DEC(" kB\nMMUPageSize: ", vma_mmu_pagesize(vma)); + SEQ_PUT_DEC("Size: ", vma->vm_end - vma->vm_start); + SEQ_PUT_DEC(" kB\nKernelPageSize: ", vma_kernel_pagesize(vma)); + SEQ_PUT_DEC(" kB\nMMUPageSize: ", vma_mmu_pagesize(vma)); seq_puts(m, " kB\n"); __show_smap(m, &mss, false); - seq_printf(m, "THPeligible: %d\n", + seq_printf(m, "THPeligible: %d\n", hugepage_vma_check(vma, vma->vm_flags, true, false, true)); if (arch_pkeys_enabled()) - seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma)); + seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma)); show_smap_vma_flags(m, vma); return 0; -- 2.39.0.314.g84b9a713c41-goog