From patchwork Mon Apr 14 22:05:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14051088 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 4AE5CC369B2 for ; Mon, 14 Apr 2025 22:08:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A79242800A2; Mon, 14 Apr 2025 18:08:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A290B28009C; Mon, 14 Apr 2025 18:08:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89F632800A2; Mon, 14 Apr 2025 18:08:14 -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 6954D28009C for ; Mon, 14 Apr 2025 18:08:14 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3BCA3C077E for ; Mon, 14 Apr 2025 22:08:15 +0000 (UTC) X-FDA: 83334038550.16.7AB61FA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 742974000B for ; Mon, 14 Apr 2025 22:08:13 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="PH/cMI4M"; spf=pass (imf01.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=1744668493; 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=08+mOgKQbYDsfFxRpx7aKoRi3ylvPpVEDruY3blZyQE=; b=RP19FIa5w5zmrWSWMeok/4wUL2mQX7Oxohx/qu6KUmt/jlWBR0shwjEikEkwgl7mBKissF kX+aD1xFEQoMgXp2yfjjQwxa4hGMB3HHrFH6lhVYmGsTFf9ZJ0z3sNaFnlyybrSDeXLXgo gL2mCwQvmTcya+E+dwPfKQInmgENSGk= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="PH/cMI4M"; spf=pass (imf01.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=1744668493; a=rsa-sha256; cv=none; b=UahD0x3oEIr48GLRh9olllWXNaUwkXVQnjgRH2aurkTP2fOv7BKJ0HfpWXu+Yl7cwiQgp4 4J0AfmpYhcBrn/Od8IiTiDua+vOGvsO1G5JtYM9TsDxC2iPesSK9ZGEXVNM+lG0kmsNaLE uCwcsFPNSO5i/NcX/0d8a0LKniBssho= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744668492; 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=08+mOgKQbYDsfFxRpx7aKoRi3ylvPpVEDruY3blZyQE=; b=PH/cMI4Mtd/QMfKCnSoLiimxdNOueZNvmCGJz1bdVJcc6wVObgMzxy3uVhx7iCkfyOSrYA 3UvAwapBgmtToONR+PT9lULLOVR7MC4qUsAusnQpfJyBobgPrq4nhGP5nNsuFuKB5UZvf3 4V6uYnwS8lBsSO4coYMLmmnQBarqjgE= Received: from mx-prod-mc-05.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-639-4jUf0svFOeK4-ka9ElZDjA-1; Mon, 14 Apr 2025 18:08:08 -0400 X-MC-Unique: 4jUf0svFOeK4-ka9ElZDjA-1 X-Mimecast-MFC-AGG-ID: 4jUf0svFOeK4-ka9ElZDjA_1744668484 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 42DD01956089; Mon, 14 Apr 2025 22:08:04 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.91]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5CB631956094; Mon, 14 Apr 2025 22:07:56 +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 Subject: [PATCH v3 11/12] khugepaged: add per-order mTHP khugepaged stats Date: Mon, 14 Apr 2025 16:05:56 -0600 Message-ID: <20250414220557.35388-12-npache@redhat.com> In-Reply-To: <20250414220557.35388-1-npache@redhat.com> References: <20250414220557.35388-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspamd-Queue-Id: 742974000B X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: 8p7s8zd8tnud6szntdgnh54f9wr6tc9i X-HE-Tag: 1744668493-212983 X-HE-Meta: U2FsdGVkX19b6HZneGMP1uDNN9FjtdQXXklMZIrxYvYVQdeGw+6jAVFesL62oJuJtrhcO9VVVAdHoamxvd1Gq+7BU1f4n4JPJHYe2BJ+eyRU8mVlW1YcvuVpmEe26ncCxy9sTX34pDUf0MEYn3m09XDzMMdfTr8g7zb7MvutQh/cjuOxrT2S2S5PgUc0uRcOqWQRAkuGTSOMtdSkUqIFzpyG8H9aNKq0FqK1EXARZhQoqiLq+LOTd6s+carARUZLnIpy0dR7WnXvzNgCVEJDnpKo9aezbj+Np07AM+3ZpS5zCPKWXACK1UR6eNFalD0KRE+EutrFz6UTPHOW9HvHcs7HRQkFY3wM3K+8d3k/uKk3B1k/eJcdA7BF31Y8o+AeNmn34WOHPJMcHwt9x45/O4qiV2BiUs+nAVYRXg0pyy4Enmh1FJfKR3jDguBnqvaKQ+E0VX3VTWOeMQ8kPfxMBnhMQFuwzlW/CVKgEg4ZeHohPIYyOJdsQvuGoH5lst87Rwe4BWGcdfzG1t6y2aFVkeBl7yNkOmfjQBTLNumXjUQX/lo4NYlP6r8S41A1jriIHcjp9vez49dQUWYpwN1pRhIemasQOkzDKzVMMMzp4I2XKMAAWsLg4T9KNeogI175UmjYbqUYz2t1FJBQbWGfqziY9jEY69DX9V/7vBptf6MtzmXqC4eOcM2CHpQPF6vq3ZNnogg6xbjzp8g65GFZ+1bUyEwhj7bmjDv3wkfDo1f5BSFAK5oeupKBsJEqTqQjuOkC1T2qkEwjGii4jq1Sk3b/JHc99gk8J/LFgtAj71z7EmiBW9iOgPu/cp3AlGfilG7nlnyqU5zJ6GjEamEBm4n07zHjBBOR14eznW37XKVLCeoOblyF6v71Va15h07hbAeTsMv6byoNuypZDq/ASqrEYFEDvNNrww4skTMkRJZlrFqcTyaNtPGMfVJiPDUIdQ8KCnmT7A01GCLHyP8 SLE2g4yq 5x8i/eQZCwZhW69+O9vTbLWlbCEI1doxqJhhLzE0tJj+qNi8wiJemJZRST+vGkH7zJVZPe5w2JH/nI+6PSxj73xAcLzd4VOA/wP5xG3JzYJdMmIyj50ohyzA/pUgcTuZ/MiKGpvrJS43pDVg9wVOj2zKlCkgJMQzXXjNH1+I/lNLMNz3GbM2ns1yIAQAc0tstcqNgSw4qVHW6o3gvGtnnqy/xKZw9LEQtRiKOQvRGNuppUAQa9aV7eI9IhRezjJX3/wLRBD0InGsM2JZID9ZuG3KuxX+SZMZyN2b1SCG9ma0p5wEPxzkHWkgPf8eqA1lPGM2ZRlBzMaawt+J0SdyDaV58X4rzLDBwfDG77lqukg2YRy0Xgz/FqvFzm5I0RQBtxf6rH1XLqtffwmvLyapBUcO7JA== 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 2acd9c1fc558..95be9d266eff 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 6db73d2d0962..35515bff392b 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 8cbde2ae0112..d35abae76c93 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); result = SCAN_EXCEED_SWAP_PTE; goto out; }