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 ED8FEC3ABA3 for ; Mon, 28 Apr 2025 18:14:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 160C56B000D; Mon, 28 Apr 2025 14:14:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E9076B00B6; Mon, 28 Apr 2025 14:14:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA4CC6B00B9; Mon, 28 Apr 2025 14:14:21 -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 CC4F66B00B6 for ; Mon, 28 Apr 2025 14:14:21 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DDB968107D for ; Mon, 28 Apr 2025 18:14:21 +0000 (UTC) X-FDA: 83384252322.04.4ACF00A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 2FB0B80004 for ; Mon, 28 Apr 2025 18:14:20 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Aniy5Lkq; spf=pass (imf02.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=1745864060; 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=lUK4EJo1p9yOMVm4PqIIKoGumhQqGfO0Cgj3FXFL3EE=; b=jSK3YhHHB5VP20y5IzlllgtuOcCajg9PfBOvaAi2acaCLH7NOccS4GnQZRRgDn1YFhztrr NKh1EeESlQAwrzB8MZgVW3tl76rnnyeo227ZeqxSomC9l8XOQcgFAVXPW/na4Anv7nxhqi 4KZ2MPmp4qPIuXFE6WUDWUPVQLTO1wY= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Aniy5Lkq; spf=pass (imf02.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=1745864060; a=rsa-sha256; cv=none; b=4NYS/QiES3JJnYJ5qDRingqaOjf6jICPGt1WdQyNTJFKouIBjk8PZPgYf0u9cblsOPA/pb 6WU5epJKi2/0tkkBtX8lmWmClOiF3Hw6D5wNMMn71DxuIwB7pSqke5gp0vzklOhv46k2AG kMuSGa0dwAb6sllZY0fP6KHE27jxlEE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745864059; 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=lUK4EJo1p9yOMVm4PqIIKoGumhQqGfO0Cgj3FXFL3EE=; b=Aniy5LkqgEU6Wt8/yK/jcPvflMebaf9elV7ViI7ZfLlcTJ2UtEbIt7klprqtlB9YzW65YQ KwtfkBR3/dbqr24+nPqsB+nLjf8rDLt5eN96eHe3tTZrMqisF4Sk3Tu6HbbsTU273+sqb8 OIpI3kAjFHv0mxNsWEADs0Qu0Nj/NZM= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-331-mba8hnT7MXae9DNdrfiMLw-1; Mon, 28 Apr 2025 14:14:16 -0400 X-MC-Unique: mba8hnT7MXae9DNdrfiMLw-1 X-Mimecast-MFC-AGG-ID: mba8hnT7MXae9DNdrfiMLw_1745864051 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CDC72180048E; Mon, 28 Apr 2025 18:14:10 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.65.12]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4E387180087B; Mon, 28 Apr 2025 18:14:03 +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: akpm@linux-foundation.org, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, 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, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com Subject: [PATCH v5 11/12] khugepaged: add per-order mTHP khugepaged stats Date: Mon, 28 Apr 2025 12:12:17 -0600 Message-ID: <20250428181218.85925-12-npache@redhat.com> In-Reply-To: <20250428181218.85925-1-npache@redhat.com> References: <20250428181218.85925-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Stat-Signature: jpq7cr49cfrbbigatsj36dkmf9x94c7h X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 2FB0B80004 X-Rspam-User: X-HE-Tag: 1745864060-545478 X-HE-Meta: U2FsdGVkX19eqesoJS9idSYkOuMmTqRFV1iE3wz3pLyefdVxwJE+E2N6gZOFi9XLHHzchX5A8+qAy+ZfhPBR6jbet9aweRaeTEFXvai96hD4W9fZx7e0Wwr/X7C0SZ4n15s5h1qPH+dbxULraCbUHKUNp5nSh6Gky3h1Lroe0ubkVEpa2R0eUCfu04Ema6DJTF1A7xpZqtRzysGiJnueCtRVtL6K+5PMXv+s/05Wz5hl3ursYNWv1TvL4+bX8PDVxPIS0LslWblaHNeeFxOgGHGG1MnDGGI1qenSm/2kjjYLcmVLZ6LDtxLSW7zHQ5CUaGcK5hVlpc4La55Q+CDwiKjeUWkrpGGywQHfEFpl+UkkYYya+sVb85mMGwRC76++ZuoGOx2+cUDQeKjqzzULx1iIQ9yFlSXZM3c3pO1plSwvGjtJXKrk4zKBi3Ss44kwXWeH+Lf6ECX30hv9N2J9XmIhfGEDc/rT1DW3GqhA/SM/PSLByRnhIBcJWeCzd3w5LkWPrc0zBACXj8+vMWK+JS4ERRUiOlOo2qN8zvvE3y5MXPW15VYx/8bqrdUyS5Egk9NYXdhbzLsM29cONXG8YTiXHP+bcUR7FVqtPphyAEcn/czxpHMSwsQVTbZhV5Dgdx8CuEB9/Zox+pY5QMRM2DdYgwtc1BWfPqzJPuPkAO1IuW8acz3OL5jxVTaWSSyExzdj6ww28tztx2KEUlDpe+pRDyIGCGYOMntsAQzwAAzSwSbBqcPXHrvPjltX36Kw8uKzkwZafbzlQzZXre2UsV1PCt/xFPbzhM/oaPnVbWgCeZFU3zj9DrB23AQL40L0vNNk95PxFZDXaUhEJygbLEhwOj8DEkVPfMvkFRk/wK8Umv/LseFskcXuGXnnD4oiyqzZRGjqEIP2bH3tHjYtl0j8fL1olNJ25J/GosZWsYROtCXJe/EsVXySswxkGF7JGTvCh0Lo8m+4F4S7otx vcp5YDBI +kv/X6+9OdDK0lynGd8W+Pja1dnpywBLI4+FxF7Vyz3zyYu+jjV4zMf18UzuFOoE3p6XNU7SEZfTaHo5EQMmzcUQZCGwoiELf+OrjtfjUgb/Cc2oh+Q/JXUTaFW5vl4gGQJj/OYCWMqTIwCYPilyub88yHb4DoemcUNS70sEeJ4Htwwbw98wNIipssHtB/Re1+77U50F9G6KCkIt/UyNkkaRNUZuk94dH07JRAuFWVWWdI1dSfPkO8zpHbwevLAlzQzHdhCqUpPrqPPlkAxJUe1nw0fNlFCgiD49298FOWfTNrC2O7G5o5QCW2ZGJeEgwWshPp6nhiP1gahNZSdDqmmCmxXIDHBY0KvIdrkxRiJnTw4WiWyws1RkoN+8sQTr4alGn8EW6I9BnvQvFADdQ+exMhA== 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 | 16 +++++++++++++--- 3 files changed, 23 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 670b8b7a6738..8af5caa0d9bc 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 1d99ef184c3f..812181354c46 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_SWAP); result = SCAN_EXCEED_SWAP_PTE; goto out; } -- 2.48.1