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 917A9C83F27 for ; Sat, 19 Jul 2025 04:42:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C812A6B008A; Sat, 19 Jul 2025 00:42:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0B0D6B008C; Sat, 19 Jul 2025 00:42:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD2B06B0092; Sat, 19 Jul 2025 00:42:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 9A1A26B008A for ; Sat, 19 Jul 2025 00:42:39 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1449457C20 for ; Sat, 19 Jul 2025 04:42:39 +0000 (UTC) X-FDA: 83679768438.10.DDFDD91 Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) by imf29.hostedemail.com (Postfix) with ESMTP id 3884C120002 for ; Sat, 19 Jul 2025 04:42:35 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=pqAms7tP; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf29.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.101 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752900157; a=rsa-sha256; cv=none; b=kzWXuT2zNCg21MqBUXVLSc9stx6gGmzEjKzrxjLgXbx+bAJsVwi448cRe2JmyO5P9aX0Ud /+0fTLT1OTn8c3EbghcTt8qTlzFWar5cOMHfpBXWuhhBXUuwWqp79yyVH3m/L2mGNH21tW Tu4QnI9Cam6WGuYUXxR/Mm4OgD8o72E= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=pqAms7tP; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf29.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.101 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752900157; 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:in-reply-to:references:references:dkim-signature; bh=9oej1REGPtmYzgvYFkCGpw3X1FEJMShlnggkh0bLJCE=; b=KCDscKsd/gDjRqapzjsv6YR8IQiRLJgZ6e4gBo9O855RDH78thkTUsNEiDFKcywnUvJzk2 sHa1QQy65cdOLBbv27IT9hRaAAW4rbxL7zlzU8N9y7t8I/vu5QnUDMLC1SM61dcM1u1mpb jjuSMkKvHiyIfqVus2kUwOZRyV8AIbM= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1752900150; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=9oej1REGPtmYzgvYFkCGpw3X1FEJMShlnggkh0bLJCE=; b=pqAms7tPmgdDIbOBAFA9wwqgTq8pn2BzvrZs5n7y+PgJ6EPe6ZRcCPSd1SQnxrH5xjdbVFuz98/VN1jNpL5Ea2LWWVLYxL5094nEztbk7atw3Ondq/OU3viFqOiKTW277p0fYC4Jt9keSTuJsuJxsOT9m5WPYFyzurRK3iy/yxw= Received: from 30.134.69.216(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WjDoVlU_1752900146 cluster:ay36) by smtp.aliyun-inc.com; Sat, 19 Jul 2025 12:42:27 +0800 Message-ID: <65b7519d-acff-4700-8bba-3c856f57a495@linux.alibaba.com> Date: Sat, 19 Jul 2025 12:42:25 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v9 13/14] khugepaged: add per-order mTHP khugepaged stats To: Nico Pache Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, david@redhat.com, ziy@nvidia.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, hughd@google.com References: <20250714003207.113275-1-npache@redhat.com> <20250714003207.113275-14-npache@redhat.com> <94c8899a-f116-4b6a-94d3-f8295ee3f535@linux.alibaba.com> From: Baolin Wang In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3884C120002 X-Stat-Signature: rm1yoq8uosde5edwqzfhwefifuqj3xkd X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1752900155-821719 X-HE-Meta: U2FsdGVkX1/DQMVmNBqw6UhjLYofmTrUsjB8F+A2jE3zdemVZBTgz6CtfD0C9QPfUSQbqcKdUZW23y9gdGuqyvbv6LHED4kykrmm8YC50G0eGh5U3FnJLiiA95fvgdg/8F4BrzgMZT6ZFwkpT+Js4Rg/QPMS6Q7DRhWNXfHBAEOJ71zQ4wIOAA2zydhfq02ZaZBKMo3Zj+/LuKveB6cwlFeSxdLNb/12pi9CZwFUML8akIYj7jLN6/1oDGtwMuwyZ5K59U8RzD4iaSFX+Yni7Vncm9mh/hqh9vtM4017gMcTkob2Y9UoHr4A4w+/6IjshXjqFREZc7PDxlW8CNo79gZ1A8U3ttkidD5lGLsH/d8rLmtmY15crZvwu4UOOy5Hc0gkeGMw8/x8Lz/7Hun7GCYn+gfp2muqgnbF03xBbY/rd5LTV1Jb2FKWEqOsvbRzQqCj3QICWo64/kSTrpuCMMmMHGJU31T8+IN3GnKjj7cMONr6h7d9Re3ItHkHez1yIzp01GeFzzdsseHdTh78ldtXJlaSwQW85oSoHDkfRDNVf32Ez3Vbh1GAtIztvqgYATEflAXk5OKr0ixRakhojaVkWWRm0ZFfY4ELdKumca7Fq2kVMXqCJ01BBzgVNcvabwPB943/l2AJXjbwL/vBprBwzrhyZt9N7hFXV37aa2sP5eEXFHzX71YZuDDbH50bbv2i9ZCUG2p5eo++M+KeswT2l/q3Dz6Z/aWdDeJAcvAVRDEXJBkR/GmXCnNQCK+lAANYh2jrP7SJnpRPLow/ky9YiGJv+2/G9URntDB52awwiBTrBWhg6o+HNzU7coVvOWLY8foHCLxI4UQpN0Z6rTgkdwGJDtAjCLEWCCIaMC2UUISKm3jvk7x4GZY094+iKQlivS55iscRnqlYZYd6D36UoaE+sAU5UiwzISnbsAP17gfZsU9VvrCJ9V0Cg+p1yOU6ljdNU/nlH5nQS+C 1hK0Q8jf Ir5GrDGtaU0vhwH410UyZXn1XIaCHLpFx6kqW95pRqTWK3pBrGL3n/jgKiQs/XRqE264ytdMtHJXfi1zOdwVYyUYADHb7tbmOvshdDCd5/7T7MDZkaoxhDk2/KbasgA4hD7pRycl7/PlzNNy9QsFkjjxsJz1UQzu+Pgnq69KNynwkitO/kYf+ZzOCm8TsRLRWmKSFeDeDg/A5iSqMovI2+jDbQibXmqA5XSFLAMa3MDkLvwv33lVYvv0lkbhidWWv6YL2Qp9JCZ8aYNiRKPSiJpAm0zxLU0eqgdiC5UxjKl8nKjCpAxxn9p8c/iA2ZKWCiDitim3NPDBMjHHnDlQLVT+rVNOee3A9CmtFxCvSuA2CEoQDgT7iCzf7AY+BdhhFM1tx8J+bGorpLqMbmOstQj4q6C+dmQthWrU9mORL/2dQ2PgYr9tBXaO2NUMCHsyaY/G0k0m7RyQUJnZgR7RCslFYSw== 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: On 2025/7/19 05:00, Nico Pache wrote: > On Thu, Jul 17, 2025 at 11:05 PM Baolin Wang > wrote: >> >> >> >> On 2025/7/14 08:32, Nico Pache wrote: >>> With mTHP support inplace, let add the per-order mTHP stats for >>> exceeding NONE, SWAP, and SHARED. >>> >>> Signed-off-by: Nico Pache >>> --- >>> Documentation/admin-guide/mm/transhuge.rst | 17 +++++++++++++++++ >>> include/linux/huge_mm.h | 3 +++ >>> mm/huge_memory.c | 7 +++++++ >>> mm/khugepaged.c | 15 ++++++++++++--- >>> 4 files changed, 39 insertions(+), 3 deletions(-) >>> >>> diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst >>> index 2c523dce6bc7..28c8af61efba 100644 >>> --- a/Documentation/admin-guide/mm/transhuge.rst >>> +++ b/Documentation/admin-guide/mm/transhuge.rst >>> @@ -658,6 +658,23 @@ nr_anon_partially_mapped >>> an anonymous THP as "partially mapped" and count it here, even though it >>> is not actually partially mapped anymore. >>> >>> +collapse_exceed_swap_pte >>> + The number of anonymous THP which contain at least one swap PTE. >>> + Currently khugepaged does not support collapsing mTHP regions that >>> + contain a swap PTE. >>> + >>> +collapse_exceed_none_pte >>> + The number of anonymous THP which have exceeded the none PTE threshold. >>> + With mTHP collapse, a bitmap is used to gather the state of a PMD region >>> + and is then recursively checked from largest to smallest order against >>> + the scaled max_ptes_none count. This counter indicates that the next >>> + enabled order will be checked. >>> + >>> +collapse_exceed_shared_pte >>> + The number of anonymous THP which contain at least one shared PTE. >>> + Currently khugepaged does not support collapsing mTHP regions that >>> + contain a shared PTE. >>> + >>> As the system ages, allocating huge pages may be expensive as the >>> system uses memory compaction to copy data around memory to free a >>> huge page for use. There are some counters in ``/proc/vmstat`` to help >>> diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h >>> index 4042078e8cc9..e0a27f80f390 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 e2ed9493df77..57e5699cf638 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 d0c99b86b304..8a5873d0a23a 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); >> >> Please follow the same logic as other mTHP statistics, meaning there is >> no need to filter out PMD-sized orders, because mTHP also supports >> PMD-sized orders. So logic should be: >> >> if (order == HPAGE_PMD_ORDER) >> count_vm_event(THP_SCAN_EXCEED_NONE_PTE); >> >> count_mthp_stat(order, MTHP_STAT_COLLAPSE_EXCEED_NONE); > Good point-- I will fix that! >> >>> 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; >>> + } >> >> Ditto. > Thanks! > > There is also the SWAP one, which is slightly different as it is > calculated during the scan phase, and in the mTHP case in the swapin > faulting code. Not sure if during the scan phase we should also > increment the counter for the PMD order... or just leave it as a > general vm_event counter since it's not attributed to an order during > scan. I believe the latter is the correct approach and only attribute > an order to it in the __collapse_huge_page_swapin function if its mTHP > collapses. Yes, that latter approach sounds reasonable to me.