From patchwork Thu Apr 17 00:02:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14054648 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 99536C369C2 for ; Thu, 17 Apr 2025 00:07:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2538C280153; Wed, 16 Apr 2025 20:07:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D86D280150; Wed, 16 Apr 2025 20:07:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 02AD2280153; Wed, 16 Apr 2025 20:07:49 -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 CD2C8280150 for ; Wed, 16 Apr 2025 20:07:49 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 737131A0F40 for ; Thu, 17 Apr 2025 00:07:50 +0000 (UTC) X-FDA: 83341597500.24.845645B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 9EE99140005 for ; Thu, 17 Apr 2025 00:07:48 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SPc3jdwy; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744848468; 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=FiTJSCBt+yo6UWFDN8Zp9G6fdmYnYcLtQKmRP4SHcxw=; b=T7NcrEXL+ES62vScGUNqu4W/2jm5mVA99kdEK7toNxWOW8jKzfgywWPiuIyctMXFd0R9Co +kKwny9hMj61HVcdIZ/Ne7va7HM1yNS6anWwfEBJCM1/BOCEjOwBVc6E+JuNaGncnFZ2mP j2bQjUTBnmW6BJc7d9eTGWuq1s6latI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744848468; a=rsa-sha256; cv=none; b=qE5MIk82/g3Gfo1zpQFNRjESDm+p8GLiX0ieaXZ8ytQiDNusj7EAwvmP7yMFG8cXeyuZVN ZAG2ZMDb9FaDNnV1k6BS99fnH3COHxQRTmwfGzIxIkXqORYL3SubS3I6HrN+gx0UXMllS7 znLLmD54TvOMhrCDBXjgbPqVoBDQOpw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SPc3jdwy; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744848468; 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=FiTJSCBt+yo6UWFDN8Zp9G6fdmYnYcLtQKmRP4SHcxw=; b=SPc3jdwyeRp/IlUEOiMD2dBio+xNRVcTdOfB+n6kikAVMTwlkGonYLrfO2M5l/VHS4a/mn Qy2q2pVLgrNOUSTh16cr0Yni+dCg9IiC54xKG62pPZjyfw3DJq9uQ7XDgk3EMM/nCUS6qI D0H8g6wLZx75yaxm2K9CnpG1FMDoX54= 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-264-KDJIGUUMPhqXuE70ZJjwQQ-1; Wed, 16 Apr 2025 20:07:43 -0400 X-MC-Unique: KDJIGUUMPhqXuE70ZJjwQQ-1 X-Mimecast-MFC-AGG-ID: KDJIGUUMPhqXuE70ZJjwQQ_1744848459 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 D8EE21801A14; Thu, 17 Apr 2025 00:07:38 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.34]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 939EA1800352; Thu, 17 Apr 2025 00:07:29 +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 Subject: [PATCH v4 11/12] khugepaged: add per-order mTHP khugepaged stats Date: Wed, 16 Apr 2025 18:02:37 -0600 Message-ID: <20250417000238.74567-12-npache@redhat.com> In-Reply-To: <20250417000238.74567-1-npache@redhat.com> References: <20250417000238.74567-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 9EE99140005 X-Rspam-User: X-Stat-Signature: j9p9ziry3a1hsg9dhene9ebzczys4x59 X-HE-Tag: 1744848468-179257 X-HE-Meta: U2FsdGVkX1/ErRR1x9ijIUtE/c2aKdtrwaOApC+Bb1Qnsn4evN50URxFb+pp5dbmYADnB8WPcLnssZlnjiIk9est8pXUKtmGhq8D6mcy4YB8sQNF64NFFkO9DSib5j7aQgwaekRoGHX4ijaDP6f2x9Dl2UDmQZY+INbFCQRx+g58YhPgRKiigJWTn9oEn3gqFJlyc8vYt2Qps2elN5c4nPdBxcNZ7nrV/Ew8Gqd/iInvVOBTj/QQKCrpMaN26/SEgRQV3ackOyvF0vXQQ93EzJduuhS09bmhu1lMETpSqic/SXXw11akfU96hB+5iOUTwMGQGhZTk+o3D9mre1Lv0xmRzCs5dwJCBSs7IjMiWveoMmy5CBJeaoXt+9UEnRsb+eu0SKrWqBdtV9TLmplBoWiwZaKa/IDwRyvfr47weU++w/+0Vm3ctIU1BKNisxVWO2RO1OolMti2cLr/8TBWvecN1xXOBW3iCJ8BKc0pcoKC0dTiW6rMGdpnKQNnKHpBzpnVYtLAdajelJm2PkVru6yqtQLkFRi39Hhm6yxWWBCbiLUEaWZbaF8cOudwB62bb159HaOx7kINcG40/UbKkSsDnXEJJTXJ4jTlHwrFrpMnE3ThBDAd8gwWiqedoKBeGNosuJbVeLOpEZCcqXf8LpIgvVygviTzpK+nMlA85vzhLwLqNfuIeLkbtYAWC9Rx2m/u0Lz5OZg/bDIzqFLAFDUtuwlX1s5HaPB5KSMtc6lGjAjRuWeJRx0fLm/H0MNCoxNksOIAmSqhbLWzHwGUZ3/qE55naLQ7W8d6xh/IyUlDIyWNz95p7ziNuz/jwQiegIYgPKfdrJTU30+mO2EZJQTpwuMK9uUPd1PsPy+F7UAWKu9LLBePtGB9xGvd0i2prd1rX4xmDfAwVZLVDXsH4k/UNmTcf/5r3pV9j2z+WF2xGmtfZNSNBxUym0XaJ0NGHrq62eAcWraF8GK+Fj5 aqv2lisI GbekwoLLwLbpJqWB3xcByj0AYQ1Foi2V9LSBY/b5jFjAHsJm3yZPCvrjQLj6plHn5TuaPgTZ1AdL4Ivil9fF6q5N5QsIgSedk77eqV4XmniWFJz45exH5yGCiTPFLOdsmQoMrTe9od6PZ/uprACw1ppMS4kXVUjhxPBYRZuFojUCnsVscnRbP+SyF9r6cVS3F7WcF4w8Y0xyMej64urLrQBAnRkCH/xmJwVgXXc+qqBUgRxLNZMWwYgGKjL7beqOMcLs+4HFY5gMp8dqu0FlPbsAl5hNABrBHaIWzz9QmbKJVQWr/6R0RwpSGbjXaMBWR4FuFoEWgagJIwIoXop0W0QRyb/73MS1wfpEiC8WmVs6hZGiDPhB+05wHyIW9mjyqE9lFgXrIQTQz/fYZF3Mg+Kx5LA== 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 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); result = SCAN_EXCEED_SWAP_PTE; goto out; }