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 26DB7C3ABDA for ; Thu, 15 May 2025 03:06:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F1F1D6B010C; Wed, 14 May 2025 23:06:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ECDEA6B010D; Wed, 14 May 2025 23:06:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D47ED6B010E; Wed, 14 May 2025 23:06:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id B3CF06B010C for ; Wed, 14 May 2025 23:06:40 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 295FE161264 for ; Thu, 15 May 2025 03:06:41 +0000 (UTC) X-FDA: 83443654602.04.F16BEB6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 65E921C000E for ; Thu, 15 May 2025 03:06:39 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=amtvtQjY; spf=pass (imf20.hostedemail.com: domain of npache@redhat.com designates 170.10.133.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=1747278399; 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=dsPVm88QHvgURVnqMjQJMgk+mjQrBPMyMJRb77fkJN4NiDJE4wlugZAzYGwdS7uA2rnD3m SeL2aRYKU2PW51ero3Bplz0RgISR7CS3CQVx1xWOeWxwPUzEB7wYhYVRxaiY/Abl8C+iwf xJp6ZLsQ6CNeRxEPvHe33gW/bi/BW74= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747278399; a=rsa-sha256; cv=none; b=cGRaVFHgEvoYLLwxvrUo1OEXr6TgWCeJM/DXoaMa64j3a6s9IgAyxkNDB6KpD0gpKUulpx 6a+NhogP0Puad5lqqNIg9zGRKYqfXtGl10ygmauLNPQt9ONF3b1IFxZLJswHuE6WCo+pcn eLMD09PTGw6HnMVnwGqftYu2XVdwRss= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=amtvtQjY; spf=pass (imf20.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747278398; 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=amtvtQjYupOy5eYXtT1ADIWhX99IG6nRroKcrCOPPINzlIvjrAJr+lS/36YC9vs0vAPLh1 0tTaunzhND8kPLo4EE4TN0Ltsg+1ZWlGoXEdeSn++phKmzI67aP4zOKCd4uI4dst+jkBFM 3nUetpXfUpb5SGS6rNe9xlXBcwI0uiE= Received: from mx-prod-mc-06.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-594-iRMKCQQuNFqhl2IMnS-0RQ-1; Wed, 14 May 2025 23:06:35 -0400 X-MC-Unique: iRMKCQQuNFqhl2IMnS-0RQ-1 X-Mimecast-MFC-AGG-ID: iRMKCQQuNFqhl2IMnS-0RQ_1747278391 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4E54E1800360; Thu, 15 May 2025 03:06:31 +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 1E33C1800359; Thu, 15 May 2025 03:06:15 +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 v6 11/12] khugepaged: add per-order mTHP khugepaged stats Date: Wed, 14 May 2025 21:03:11 -0600 Message-ID: <20250515030312.125567-12-npache@redhat.com> In-Reply-To: <20250515030312.125567-11-npache@redhat.com> References: <20250515030312.125567-1-npache@redhat.com> <20250515030312.125567-2-npache@redhat.com> <20250515030312.125567-3-npache@redhat.com> <20250515030312.125567-4-npache@redhat.com> <20250515030312.125567-5-npache@redhat.com> <20250515030312.125567-6-npache@redhat.com> <20250515030312.125567-7-npache@redhat.com> <20250515030312.125567-8-npache@redhat.com> <20250515030312.125567-9-npache@redhat.com> <20250515030312.125567-10-npache@redhat.com> <20250515030312.125567-11-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-Server: rspam08 X-Rspamd-Queue-Id: 65E921C000E X-Stat-Signature: 8rp14xhke1x7zytc5jqkimc5jdia7juf X-Rspam-User: X-HE-Tag: 1747278399-355350 X-HE-Meta: U2FsdGVkX1/ZVnbR2Z0A/+92COi9/tDgEF86zmurqsZFOo63zi/JvW6uQf4mkJVORpc6yHdHofKWLIKtSBCttCR6/eOA87hNKMvyFiTeejIz5BSXJDG3Go/h2c9tftKE+5H+A/DgJ7FoV2NS75OrQjVN2HCKYHO/rG/+1k1y3iSrv3cLlDG9LgR4hIl4lvtCwug3XkOThhUfnuGIIoEl3AM34Xzs1rof1jyXTtdTbqD0aoXcctcZoGD/krzEeKTN/sz2Xu9pk2JgesR08WmQD/JfbRYQi6TFIv5YtKK9lF11Dz1bnOPCJ1Yy2kiBeSm/nGFmvGV3c2/MSs1dnWabjCyEGSRhD2H7KLP1LcEMSEZtG53qkiTzCZxnAKnGJpzVgbCVAXsc5MNCluj6lBcOVFtCVjt+wayFgyjJU7lA56w5T8zZGdW/GGTjDs1++PR5sDR7S8dMDYE2q+QxbC611K77m4HBVe6ySS+8OIWXHQOaVgir7/GY81dcVkCygGtoRcyFPyKQ6b4ulNE4Lzaxmzt2+gcfQQ/xsJVX5Nn412pPV9SiOsvDF/oCoxkol1qrwRF5hjxTqNDTxtvXUXj9EvUkvkKGRK1OJ8ra8ZDvhJdiviDfQ7BimypUTe0G23A7nPz70s7SQVt3pH+8jwz9a4WIT+9NysSCoq8pEY5bI/28B3AKHokUx5gkTd/FuzNYp7I2fmsmLjRcNknLoOum78ah7cM6XU5NA8WpiqjT4yahd3jA0eyVfYjE58fmrWNFqmR6QpH4vwcZ7gFZxnHOHCk9nIYe3NmANgk5PiHiQqbXNF2Ayfcbnko2rRl8x+BZNnnH3jTDerYZjR9lRmPaXJz+JCee7wK+K2gOu0UjE4z6Lqba0uSipgjEZjHnDXvC6FWdfMisegnIfvb4gbmss22IP3rtEiBJcxaKkXrK0rGv7I7GVuNl59+Uio9zgdsVOU3nptwCLQkmNVgmwt6 cs1r9CGw Nd19wQfF4UtZ0QC0MjH8+GPodImk9pBDCVc6rnFQKDWrbM9oMaktLrR1BY1qupFr5yx0JeyNoqJz0xzF77l0EWL7nDsbThdswkhnyM0weZJBRzMgIAaLXH2QUzpeQCOu/95q1u/9ri1RQJ1xfxcE/F3+YVqW9XLkEZ9rY69/W7u2FlXcmipsXGMISgjOKl3Kt2SbJS4xNV4yGhG6m3nfSJ0ILkYRlcKQdVUhCa461gYiq/vBMbQwzHPCFU7QirK2rDJ9WiPY+SNDCdKxk3JdWYA7pFKRQ+63THi78PEBdzEN1U3t7/jmFYiA4m5VOiu+VGXcEvqIheprkM7x1/t/zv2Nk4c5pY3AUfpkg40optmysR3jURv4obsURc03lGTHHcaWFu4D2zPl4ldm+89heyS/YTw== 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