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 135DAC3ABC9 for ; Thu, 15 May 2025 03:25:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 44E536B00A8; Wed, 14 May 2025 23:25:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3EFA86B00FC; Wed, 14 May 2025 23:25:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26A046B00FE; Wed, 14 May 2025 23:25:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 039286B00A8 for ; Wed, 14 May 2025 23:25:45 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0B568160764 for ; Thu, 15 May 2025 03:25:47 +0000 (UTC) X-FDA: 83443702734.03.1AE5D66 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 4A8AB160008 for ; Thu, 15 May 2025 03:25:45 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YnpEhp3j; spf=pass (imf08.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747279545; 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=P8zPwPaQZipnjcHJrhPU5In/r6KTt5EaEO2/apKWg+g=; b=v+agwtJLHkG+vpyF8V3wjh15/hApwzY1R45te3LeRHp3Ooi2issw7i//6L1r3Ggt/yEAAD LBoJVTj+5l0gPw6TFiP9XUHZIime4Vtatb1XuryhWi7DhSsG814R3Z1EHKZbQf7BlgvyR3 wQV2DeB3YjCvVJa4KyBCI/swg5pmjAs= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YnpEhp3j; spf=pass (imf08.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747279545; a=rsa-sha256; cv=none; b=JOlX3z/3oVdyY8Xd5kG9++D7mXL2WZZ/no7kUk831pMRnb5TXsoMa313V5AIms3Bm+Am9q dLcTmeFtBabFRkNYZYM8kpziFL5wXPirb4IeDs8dGHWHLPLfaD/rM1VZ0taI3kaTuoGTe6 QSI07LuvSCmJECweS3boTtiU2feF/g4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747279544; 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=P8zPwPaQZipnjcHJrhPU5In/r6KTt5EaEO2/apKWg+g=; b=YnpEhp3juQESAeV9Iyr/hhIKbnhhJ2Gnjo9U3B5Kkfct8/Lx79w53VrgGGYEDG+w7AdRV+ 1XhE6txr3u4g1joAyiTAljmAGKtw0Fbq++Hf70+DSBkQ0k2TR+w5XutVCWSPKYo5PYyRNo KOcMFuN6q2Q6Trtv6cDImfM+TGF94RQ= Received: from mx-prod-mc-02.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-119-MIeqq9FUPhydHjjjy-dcRA-1; Wed, 14 May 2025 23:25:43 -0400 X-MC-Unique: MIeqq9FUPhydHjjjy-dcRA-1 X-Mimecast-MFC-AGG-ID: MIeqq9FUPhydHjjjy-dcRA_1747279539 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 78251195608C; Thu, 15 May 2025 03:25:39 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 994BA180087A; Thu, 15 May 2025 03:25:24 +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 v7 11/12] khugepaged: add per-order mTHP khugepaged stats Date: Wed, 14 May 2025 21:22:25 -0600 Message-ID: <20250515032226.128900-12-npache@redhat.com> In-Reply-To: <20250515032226.128900-1-npache@redhat.com> References: <20250515032226.128900-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-Rspamd-Queue-Id: 4A8AB160008 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 5wcsx84q3wbnwzkis3zdmp5q19srwz99 X-HE-Tag: 1747279545-454208 X-HE-Meta: U2FsdGVkX19/OxtNP4TkrzqN8aaVbkwosbJ86fmpWlL3mGgWaNF7bmNeQaIb7GQB4Umbo8eFplUGihxMerukNdrnAXUpPH8GsO0w301MvmIIXoXUx6QvjQ8dePvX7VFj7yISin6MEdJrR3l9EiHDgqpIFN1BVzwy5MtlhBBftwXbBCDX+bSjfoRHEC3sRRL+Ow+LSDDHpDRbUMMGRjMM0rqFLPJw7n5CKWXIG/YDAo9cZwVlJWGe9OEu4hUmmCkCyWRXfTGoM1yg0GfBhscUzWMkB+zpMTsNkcBu23iuRne4EBwogHUw3IoQsCycclHA5fpTCfQwEir490Tf61dQZDIFdC54vxSGux4budbylQRYwQC2lSTv14tKH7wt69wUX6lWpaAqvCYvYNrRSQrbVpJB4RHY8UpqBmQbB0Uu3Igtk4RoAgsnhAu4ABdIfSSY3zBAoZMpmpGQePPxqLeXa9LXxrM2ov/QgTRF2lkxZc+PNLiuSz+XGUiaKjgBEklpBZEd13JirQcbUClF6ZidCs6mCl1D4vpQgOWZC3zX4idFte2+/bl+A2klc0purmhdZRVydNzAp5krIm0OyF4pxcmujWfN+5GiWF2yX7aQwOo7MVKmailNdNrC4G6A11w7r3zX4M14IjmxnH2sj7PYEs4pvNRREDtPH3AoyR/ouMN0H/3V7KjP2impkxCy2n/xGBa8i6E+pX7K2zKD8ErFP9S+MykhKbL9qgP60lrHFMelIcqBUU+6jm6CF+QYdP/339PhL3Zr1JSeyWkI6gN5taKVa+SmuUlNf5wjtsSHjraRlnvFg62iGwjBnZ1vxKVUTe/VbeWcUcC62i9it0WVJVvx8NjuIhIrjHlpAGcRlKU00UjtBMNWONel3br+QIQ0BCSPjdVdflttgxOyoWA8FvN9kp6sEUHwqPawLcWLHHsP3rspxUFfCP7DCHoJDF6V/YqWE7D6xFePSBMLJ6L rPumP5/7 jfKfEiTvkeIRDiDyyAIOmIYY7OhHewMCc30XS0oUgWh21SPXrB+t7qOFdK0HBviFJGvcrkTjJ9krlNBCzL7Mm+NJNmOH32vGCtAYqvNdrmSbrg6AqjCLp/2w39WP6tfRx3vHWdkhFgaQTTK+ElgVU2jF7x12HDRmBT0hiHlYh2/LlXHfRxNjgFETUmNmVcofaUDeG6Xj51osLGy6ad1BlJqWXos8Ijdh0MUnMMxS3FCO4TZS3WitJ5w+HU2gdqC0fd4GVw6p2TDBsOtGbpnE83yLw+qHJmh2pmxVeGq+pOeVMex7t7XXzn+BqThZULlQTFlp0JkmpK8j4oMSXDY/Ck6/AS1o6IlsvE+Ta0n5L7ZT8Q0d0irFIgGE/z8JOyf3TIS8IWYwfI8yyImJkdoTePKyYDA== 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 0bb65bd4e6dd..e3d15c737008 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 177f0a78666a..700988a0d5cf 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 951c44778f56..0723b184c7a4 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; -- 2.49.0