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 DEEC9C369AB for ; Thu, 24 Apr 2025 07:58:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BB41C6B00AF; Thu, 24 Apr 2025 03:58:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B3AF96B00B0; Thu, 24 Apr 2025 03:58:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 98E166B00B1; Thu, 24 Apr 2025 03:58:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 779AE6B00AF for ; Thu, 24 Apr 2025 03:58:41 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B6322140D3C for ; Thu, 24 Apr 2025 07:58:41 +0000 (UTC) X-FDA: 83368185642.28.A2E0BDB Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by imf01.hostedemail.com (Postfix) with ESMTP id B23A34000B for ; Thu, 24 Apr 2025 07:58:38 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=UbFMpS3O; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf01.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745481519; a=rsa-sha256; cv=none; b=YVGZkqs1DAOTvJ/jEBAkE8Z/R3DxYdz8elL3a980pMG/emQxV/5/2kTRBR8oyHGn2fHAHF AIBHRGIdTz3GIxrc6H4WuHF8T1NyNPco0/VbyHs9SUj2a7xnGJuS56sHsiqy1GGlHAW2SE u5Bz68Bzg5DNSm0dmBjq5dV0E1MTPyw= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=UbFMpS3O; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf01.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 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=1745481519; 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=H0gocb5iI1crfNKS2sNjti9gog88ZtstDnT2iPYTsTI=; b=aZwEgYgmlW7RJyGhwQlsoKDgf6YiBfCXWXEXCm13D1CDoeb/V5t7zZ4UYYydQNYEPXQEhw nK7v5KafDsdVPqsp3cPZMnFc/tuQM649Ka2NXeOS0GdRZNrPIsxxYY6nHupSN/09gD0TSP Suw9XO12f2whM3cIKiVBK/uVMrj1f1s= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1745481515; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=H0gocb5iI1crfNKS2sNjti9gog88ZtstDnT2iPYTsTI=; b=UbFMpS3Owo9RD98iHx0D8oABWif0P8fHMPNk++KQhfbLvHcsxEpHz7OFCyUMa2bIfuMhC5dYneexVGwS6uV4cjovTGzuYTy/aOBRGEu6yHHntHCX465es6K6O1U+rgLdIS3cc2I/OsK0ifnVUuxoTyY1nRF54H/FmDh7Mwq2zcw= Received: from 30.74.146.225(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WXyI6u0_1745481512 cluster:ay36) by smtp.aliyun-inc.com; Thu, 24 Apr 2025 15:58:33 +0800 Message-ID: <30180bde-d813-40dd-83f4-0cc04daf6df6@linux.alibaba.com> Date: Thu, 24 Apr 2025 15:58:31 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 11/12] khugepaged: add per-order mTHP khugepaged stats To: Nico Pache , linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, david@redhat.com, baohua@kernel.org, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ziy@nvidia.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, dev.jain@arm.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 References: <20250417000238.74567-1-npache@redhat.com> <20250417000238.74567-12-npache@redhat.com> From: Baolin Wang In-Reply-To: <20250417000238.74567-12-npache@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: B23A34000B X-Stat-Signature: xod9bzwed16dgjyy9pkwnfk1tpmtxr9w X-Rspam-User: X-HE-Tag: 1745481518-312181 X-HE-Meta: U2FsdGVkX19huS7arJ+OBiD42FsucxsC5Ie63+GPokn97FCOdycxFzeatUEroj3hGrRfyDH3d0uRxUm+A8KGsvkp2JfW8H9bY0rPCm24xEnxjh400LsY+STI4BBxgstmhLzj2GLQTVDh77bfaMI63ddqCIb/E9Tj0t91h+cBg70f19XNVkw9ruYd84ER7nHLZZeanZNTVK/XUH4HRnF3aCgX0s/u3avFT8DF24y0rHcc/9Z8dzj8lOxWVr07hyrdo2ieUgIBmql56NR7a3E4biBtuOgD0fHbGB7lGLCuerHwmfeXdJeGUufwB+Zo1kL4aNyukVcwyOSHnPgrGp7K8xwKf18vctq/x94Kc/UZIZjYx7Hi63u3lEPyVtnWGStvT+4OWhtyaMnxgaVwfZSF3sLA8KEgEaGmHqQwWrGNwiu8LPYp53l2ImrASSzvtfcydCZ79+DiVBgzSPC7l9M0EXysSSLsLz2ws4DQtSS+hC1HbhQk+JFhhiemPSKZ6FqY9ECvZWIKHo0dqHyL8JXhoIdOGZP4woc9A1W8Ao+a+/68yPntphYhNmwmY1/Up7vfNOlcYju+DqAkNfDTIwq2cjehHB8kWlm6INDfv+FeNpSKuqm+v1OQtoC39Ztfnv0piK9+oesbYhwpJ0GYaNV59Y7/ww4VXhk8aVBXCAOhQ7jqzwJ8zXmcwLjZugCsiSokN8JF7PWzMcVPPZgFEj7deaSyLsuyaxVJIDQPOqVlB26/WZoaNWEWLAq6eWP/gfO/RSm+Me78ElNHwy/pE33js+65wjMK6IgEtF7ETpoOW2zxHS636LotU5LpzP2F/YL8NYI51TkkaUt/QbhadEr4VCb75KsLYsbv2wmCY7N+fGavT3EWN3uqNDcBbxIPpIIoFhQ8al7LfmBYHcJHbIwhkre+/BP3MWbLftdrAKUXD4k+qfTQMOp2zNEFHVzq+8r8ZOuNzhe4gK3hiXkhG1J NGZk7xVr gMfol+jiR7aoVha2rJr5C1UpT23hoGnXSYmVqsmQi4WmTXSCkYArghfYXMoXpIethp49Ku2ysxgXBSEovi3KvyDsxOElqn8MpjGNs5Ol0vATDhq8Gmibs4E29XTws47iclSsJlbYKt3Zx6RBSz3Rsa95AEOa0PswwwY1Dj6zqEjHK99PgCALsNQAJwk8DdBC3GCsHAekrpfBRMW5wNUCNcN6BRw0MvrZAUTEPNBrtQjcB6zBnZ8MGFLzNL5PN9Nr7YN645D233oW7dumJIhK9IDoMe42SE1C2YEKT7YeqQWXUS4wsitxjXlivbrwWeDFlvFwM2L3duoailllmMqaYXL6lAP6wv8CYSsIHmxOAERsikOGtJc3PdgD37Ln8PBupwJJQ 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/4/17 08:02, 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 > --- > include/linux/huge_mm.h | 3 +++ > mm/huge_memory.c | 7 +++++++ > mm/khugepaged.c | 16 +++++++++++++--- > 3 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index 55b242335420..782d3a7854b4 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -139,6 +139,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 7798c9284533..de4704af0022 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -633,6 +633,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, > @@ -649,6 +653,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 67da0950b833..38643a681ba5 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -604,7 +604,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; > } > } > @@ -633,8 +636,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; > @@ -1060,6 +1069,7 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm, > > /* Dont swapin for mTHP collapse */ > if (order != HPAGE_PMD_ORDER) { > + count_mthp_stat(order, MTHP_STAT_COLLAPSE_EXCEED_SHARED); Should be MTHP_STAT_COLLAPSE_EXCEED_SWAP? > result = SCAN_EXCEED_SWAP_PTE; > goto out; > }