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 3DE36C83013 for ; Wed, 2 Jul 2025 06:02:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CECD96B00D4; Wed, 2 Jul 2025 02:02:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CA2ED6B00D5; Wed, 2 Jul 2025 02:02:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3E6C6B00D6; Wed, 2 Jul 2025 02:02:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9D87C6B00D4 for ; Wed, 2 Jul 2025 02:02:18 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 61FF95B229 for ; Wed, 2 Jul 2025 06:02:18 +0000 (UTC) X-FDA: 83618279556.24.C5C7925 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 5A6D414000A for ; Wed, 2 Jul 2025 06:02:16 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="NbdC/ODj"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751436136; a=rsa-sha256; cv=none; b=dLj08J9pnVd0cu1z1+RYtd8NXGskUxk+vXULERbAb7no7b9eJE3kDwg+LOa2bfCxXV/b4Q n4VGmPQa5ZwFpzXmpxc8wk2nB/6p+1eDcaCHG6o+hA0T6NqxH8rror4/mCEU2B03aBvng0 +WcGpYWdoGiY05cjrJlNUrm+ypDUwhE= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="NbdC/ODj"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751436136; 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:dkim-signature; bh=KrLYUyOSHv6ti8mLUpiK2UpRJKu3qFGfunZUfG2C6A4=; b=vcGY5WSkWMfZXRnX0qglC7wLF4j8uNKgUlWdxaVsy5/z+Ei66wbAlELbUmf/4Ustg+wMsT 7KsYi4YzC4YPEiQ1XkLocf96KKPe+kneEcXkeg6hLOCMiawYLyxnCGROVzw8MfZlJJKHmK MZ1QFj/tNHoknKJ8ZzQmJb2sz1B02C8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751436135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KrLYUyOSHv6ti8mLUpiK2UpRJKu3qFGfunZUfG2C6A4=; b=NbdC/ODjr32gRdpZwl+aNdCTQxtCRlGGpn9OePcfC4tJkT02c1CGLWuozGswh4CN0yrkbf KTecN90Dv/TR6t3+Yjm/pmDnkMBuNq72nlzRNVIXcsaaz0pGam6t1BShqU50OFW6xC+f/L Vek5NoKTMkF5Y7FPZp2vf+dj07goW60= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-140-xQprs1ByMli6vDlVE0PNBw-1; Wed, 02 Jul 2025 02:02:09 -0400 X-MC-Unique: xQprs1ByMli6vDlVE0PNBw-1 X-Mimecast-MFC-AGG-ID: xQprs1ByMli6vDlVE0PNBw_1751436125 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 78E0F195608C; Wed, 2 Jul 2025 06:02:05 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.112]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9DFEC1800285; Wed, 2 Jul 2025 06:01:50 +0000 (UTC) From: Nico Pache To: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: david@redhat.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, ryan.roberts@arm.com, dev.jain@arm.com, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, akpm@linux-foundation.org, baohua@kernel.org, willy@infradead.org, peterx@redhat.com, wangkefeng.wang@huawei.com, usamaarif642@gmail.com, sunnanyong@huawei.com, vishal.moola@gmail.com, thomas.hellstrom@linux.intel.com, yang@os.amperecomputing.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, raquini@redhat.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, tiwai@suse.de, will@kernel.org, dave.hansen@linux.intel.com, jack@suse.cz, cl@gentwo.org, jglisse@google.com, surenb@google.com, zokeefe@google.com, hannes@cmpxchg.org, rientjes@google.com, mhocko@suse.com, rdunlap@infradead.org Subject: [PATCH v8 14/15] khugepaged: add per-order mTHP khugepaged stats Date: Tue, 1 Jul 2025 23:57:41 -0600 Message-ID: <20250702055742.102808-15-npache@redhat.com> In-Reply-To: <20250702055742.102808-1-npache@redhat.com> References: <20250702055742.102808-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Stat-Signature: 9betsinnho4icyctcyfaor5eeam1s1hj X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 5A6D414000A X-Rspam-User: X-HE-Tag: 1751436136-507101 X-HE-Meta: U2FsdGVkX183wRqXNQ32/LvOt/5RxzDvDoLaDvLB3tQcebK+jVmEBWpSRkeie3h3hFwU1WIOi1FHyNl4WZKuCP6jiHObMwdG3KAaM1d63JQpWGdhs6ilqRrUJVukH3nag7tPJuvHu5MBGV19EKoKBhKBbKg8e1FWMu6BI5cAotJk49KUJU54aeBZPNxQQg9pyufZgLb7mxxG7nwuOfW7SthmWPcxwAWcl11thQ1Hr+q11rgQ13yHLzTuQG96JI3Wad0IcNxgtdAwQfGwHa/Pwtqhkz7WPLK4/jKiz3/CNr3sMXmMEI5OsrFggU/M6wchyABUVrOcqez1TIhV7//E7b76ll1CQJbfVbzuylHpwXdtphOfmlEPrmMzum36ZhcuNi4cAztDhjfPCgYu8z7jGMIWmB1hkLFuFHUeeAiqeUI8+W5t5IBGReDTatFrIKf7dJZzAC0upbvd/XyDi0cEWk6Hxmto9mr2QdQ9ZcLoU3yB5fxeCWbiti6a08FC5MEfoiIExSYNPxRWgrjM3+5s4fjh2LqtKy3ugWqJKtwTesH6XccD0dz7Tea7QCaqSWe1/6oLz3nuaPRd9wetbY4k2qQAXRo5L+sBXumhqC1Q5mMBu+46ea9jKiKMZQFsGQ1n6G5yaQ1XjvqvBhNqgSvzn3QqzqirAcadVbXmu+SigOIVJA2GwIYQBGSDU/th15J+Jz1qBzEUMMfxPKEoXJrlStN5EOuolpt8klIzYxaw32IssXH2aSboN+fGgqaAq0tlox9mV3mzx+hqJsfexyPKy5G0LPzFolqtqACCwTiZosllJxqwz4HPbckw7f2yjiMiXUhQcLQgD7h5qmyYdzpzuS+c/aB3nA+WVK+JKlRlP9bxs58Lb6lOXKS2qbj0lf66mFCTfyqyyeEOo6onyemihga3lAP1W6RGQrbu0xGotphS7BIR0ZWzol4+K9VrJcW/4PCB/Jeq094wfukcyej omiOdQao DFAGvk8dTs3+Wcc8ndmpaHjj3YbYq2WqZRw8BrgaOch5h9dBSaebIGrmuZUnwr4LTGE2uo4At+2q2U0hulRX4uEWGDQQ0MthkzS13ije09EQUw42NhPRuVTRmdgDGYAUAedkzE23yMeyNOPeMGj+u2Cbl2GyxoThdGoQs+5GzVkIo+pBrWbbvMIIEOZer0Opi+0SRpu2RQ1ib5n57QsHDJdm2Akr5kLMmPWBIpIQngakW93vCXcYhdIf7HnQ5cjDXbua1K8RMGrIJteMvtnnbQaNfI3pJHbtTqVi01Nk8ZuG3dvqFA0u+bn1fF7XXrZIWC12XkEkp+iLMpe3Bu4Vc+ESx/lnMRRiDGY9y2/Bl4vWtrvYqOW4qYaIPkFMznmFp+b7amKnUYpLMWNTO6kIVpUAI6g== 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: List-Subscribe: List-Unsubscribe: With mTHP support inplace, let add the per-order mTHP stats for exceeding NONE, SWAP, and SHARED. Signed-off-by: Nico Pache --- include/linux/huge_mm.h | 3 +++ mm/huge_memory.c | 7 +++++++ mm/khugepaged.c | 15 ++++++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index a6ea89fdaee6..6034b4c9dae5 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -141,6 +141,9 @@ enum mthp_stat_item { MTHP_STAT_SPLIT_DEFERRED, MTHP_STAT_NR_ANON, MTHP_STAT_NR_ANON_PARTIALLY_MAPPED, + MTHP_STAT_COLLAPSE_EXCEED_SWAP, + MTHP_STAT_COLLAPSE_EXCEED_NONE, + MTHP_STAT_COLLAPSE_EXCEED_SHARED, __MTHP_STAT_COUNT }; diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 69777a35e722..3eb1c34be601 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -632,6 +632,10 @@ DEFINE_MTHP_STAT_ATTR(split_failed, MTHP_STAT_SPLIT_FAILED); DEFINE_MTHP_STAT_ATTR(split_deferred, MTHP_STAT_SPLIT_DEFERRED); DEFINE_MTHP_STAT_ATTR(nr_anon, MTHP_STAT_NR_ANON); DEFINE_MTHP_STAT_ATTR(nr_anon_partially_mapped, MTHP_STAT_NR_ANON_PARTIALLY_MAPPED); +DEFINE_MTHP_STAT_ATTR(collapse_exceed_swap_pte, MTHP_STAT_COLLAPSE_EXCEED_SWAP); +DEFINE_MTHP_STAT_ATTR(collapse_exceed_none_pte, MTHP_STAT_COLLAPSE_EXCEED_NONE); +DEFINE_MTHP_STAT_ATTR(collapse_exceed_shared_pte, MTHP_STAT_COLLAPSE_EXCEED_SHARED); + static struct attribute *anon_stats_attrs[] = { &anon_fault_alloc_attr.attr, @@ -648,6 +652,9 @@ static struct attribute *anon_stats_attrs[] = { &split_deferred_attr.attr, &nr_anon_attr.attr, &nr_anon_partially_mapped_attr.attr, + &collapse_exceed_swap_pte_attr.attr, + &collapse_exceed_none_pte_attr.attr, + &collapse_exceed_shared_pte_attr.attr, NULL, }; diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 2c0962637c34..636b84bf1ca1 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -594,7 +594,10 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, continue; } else { result = SCAN_EXCEED_NONE_PTE; - count_vm_event(THP_SCAN_EXCEED_NONE_PTE); + if (order == HPAGE_PMD_ORDER) + count_vm_event(THP_SCAN_EXCEED_NONE_PTE); + else + count_mthp_stat(order, MTHP_STAT_COLLAPSE_EXCEED_NONE); goto out; } } @@ -623,8 +626,14 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, /* See khugepaged_scan_pmd(). */ if (folio_maybe_mapped_shared(folio)) { ++shared; - if (order != HPAGE_PMD_ORDER || (cc->is_khugepaged && - shared > khugepaged_max_ptes_shared)) { + if (order != HPAGE_PMD_ORDER) { + result = SCAN_EXCEED_SHARED_PTE; + count_mthp_stat(order, MTHP_STAT_COLLAPSE_EXCEED_SHARED); + goto out; + } + + if (cc->is_khugepaged && + shared > khugepaged_max_ptes_shared) { result = SCAN_EXCEED_SHARED_PTE; count_vm_event(THP_SCAN_EXCEED_SHARED_PTE); goto out; -- 2.49.0