From patchwork Mon Apr 14 22:05:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14051081 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 956DBC369B2 for ; Mon, 14 Apr 2025 22:07:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2107128009A; Mon, 14 Apr 2025 18:07:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BEAF280099; Mon, 14 Apr 2025 18:07:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9B4C28009A; Mon, 14 Apr 2025 18:07:27 -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 C87E0280080 for ; Mon, 14 Apr 2025 18:07:27 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 90845AF79D for ; Mon, 14 Apr 2025 22:07:28 +0000 (UTC) X-FDA: 83334036576.25.CC26B8B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id DC6EFC000C for ; Mon, 14 Apr 2025 22:07:26 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TW9WMWlG; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.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=1744668446; 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=LwfaqVbYWAe5PPpMULuDSiltysEc1OKRHt4db4/C9b4=; b=3Q3pUsGA7NpQcEebO4zLb1iBLM2Z6V1y9BF/7QMT1jn4OrK5NrK5lLwzyF+WdUm+j2HXpD IlIIoQ+060eEM7iHokmqcnRRN+cJNGopE4OYPZ3kyTM6VyAXBdK2NmS9xlbn03/kHoERiE /WKIY2nhe/UzLLjBeRsHtjq0VbdvxiA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744668446; a=rsa-sha256; cv=none; b=D7pfYutjO+PitJ3EuZyv6RJ1henIPJ93OQEpv/qrSyjYvojEXeR/zMGJTit80gvx407WPy vzX4GGoKwfSau00gcrqAewj2cJmGUSuV8k0jb3XcDQ+QN3p9Ybo/xdl80lMHJXk7uHjI6O FXJqJkPQ0M8nLQ0zVw69QTE5HkMCYWw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TW9WMWlG; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.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=1744668446; 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=LwfaqVbYWAe5PPpMULuDSiltysEc1OKRHt4db4/C9b4=; b=TW9WMWlGWI/ZLs0AaA82h4FKAwM57IwiDHrTzVVxMWjLebDkJLmQx4eoBpYgveb2FMv4Jq aCYK/Kdbo9mWDkr9uzIXC3UZLIMw2cXZ2r9SCHFoKOqxZpp5tlGLQ44tLLORs8wDafEeKG bfWyRPBSGlCUFOWYKh/bC9CPnCg684U= Received: from mx-prod-mc-03.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-562-zq8_oPZdMPOsMgNxG3XyGw-1; Mon, 14 Apr 2025 18:07:12 -0400 X-MC-Unique: zq8_oPZdMPOsMgNxG3XyGw-1 X-Mimecast-MFC-AGG-ID: zq8_oPZdMPOsMgNxG3XyGw_1744668428 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 709041954B36; Mon, 14 Apr 2025 22:07:07 +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 251ED1956094; Mon, 14 Apr 2025 22:06:58 +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 04/12] khugepaged: generalize alloc_charge_folio() Date: Mon, 14 Apr 2025 16:05:49 -0600 Message-ID: <20250414220557.35388-5-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-Server: rspam07 X-Rspamd-Queue-Id: DC6EFC000C X-Stat-Signature: 8ptf7ndnj4bguu3jc3hgjfruq8op5zpg X-Rspam-User: X-HE-Tag: 1744668446-673805 X-HE-Meta: U2FsdGVkX1+6pBR6eUB094I2SzwfJiWs8CjcmY/FpCO2f0TF2wj7NZoXEbp8TKb6d5Yro+CuVZ6rWTYFCVHGPk11Vmkse8i9D9voxF40j4lX1THyzh/qJcviQHx8t1JjZBI+2a8duT8Lf8aI/pZVIxD/ifMflS0Eavelz8xnQgpMg9ccLKaySQXHWq3OnozW0blWRxtShMOIus0Lh15tisk+jPkAhFL4yji7HyYMJ7frXiME+QGcx6MmICEi0NoDrRelU7XUf4knquh4VSMqE6vn8gfwyEfc9KARXHpNI7rNEC42WTv5yiDrYzucuzTSdp9189WgD00aNmOTUl1UIBzekVd4g0ncjRk8l5ansRjxzhdjKWCZpEM913poo/OmOo3sN4T7smODnpOtVtyhCdEPXDod8NjZo4bFy8KuYNlGUshsnP1IGnS99ZZlhsuQVpAlDNsD67WDqI9YLeVGV3ehJn4NGSIbK90lItnBezsNDn0zcbPsxqunrJ0E3/qzvFITqiLXGnRn367GqRxwNYMWB5IcXMVAq547JeVMy6EArBEbY/e5ri42aUJBI4bsqDFdxSo89gEv+387iBboIb1qoltttNrzsAUDS6ABlB8mQk5eLVK5tEUi5VQPOIzkpZszRbGFSkakf52wRI27rGMqpOdmDUZj1Yy84Mxm+cynGOInitK+gYopBnXc1BtyLM1/WgHhSUcFJ63AAQsG/lM1D7mSalL18U8e+SCN5Tv2pT8CQ98+RitHIpMNCDMQ6azMQP3S+KJBpRjKYgx+y9d8GAk8NI2mds+6dcxfpciPFWi9K8mblhl/ATkTiurdOoE4T5Svy/wwsCWqjIMRXA6t42kyALaOnlzwtyYYB7CljmCmMNWwbTNJvsFD/vXx2ZLQOsRJ5VtYyLSD8YBIHLqF9Z4sg4ISJ1sRRhfpIDQiYEzM3r0fDpBOVRgxpnac2zHgICxUFqrhdBYsau/ bc7hDdHl IK/ebkcDnvD0/+gkdpiBGlTD4ZeyKjQSWVaf7rQWuxOek9rm4D6wBBquURiur6djlAIObFrUwbnxqfjkkuTdWykTktADbP0P6DEyn2PxNPTVtckLiEnvY2WKQTL9GvBL6wApG+HMnZo98Okm7W8T19YmNF5XXT60X4EWY9CiUU4/GD67s3Fa/tEKcC/XovTCBhkoBOYRA6qnzx83LB4SvfYRY/989btp8OmzbhNT1LIZDs10FNP+GKFEHiYF2gbafKLdqN2tD2g/zC+m4M8/MQ0yhhQdyWH9O6HrwLspeyuGVSTFE892QKEo5KMYLYEq7Bacpvh3dpPZsZrA1Vs3wVWWBadLwtLJva/BP3Fh4QSC53PFy6YZeSIy+UmDEUZ1fME3wIFOawdM0kWSGKfyBO/BzTx9+5ps8o4qJ0aKQyeySdjGkAYSw+AQbSIzm36h9fcuf7wJOtQ0gQYNbj5LT/qffxIgbrvgdQRvOsCaZmUGzIenpJIVdQqwJHGE+p9C1KyGF 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: From: Dev Jain Pass order to alloc_charge_folio() and update mTHP statistics. Co-developed-by: Nico Pache Signed-off-by: Nico Pache Signed-off-by: Dev Jain --- include/linux/huge_mm.h | 2 ++ mm/huge_memory.c | 4 ++++ mm/khugepaged.c | 17 +++++++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index e893d546a49f..2acd9c1fc558 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -123,6 +123,8 @@ enum mthp_stat_item { MTHP_STAT_ANON_FAULT_ALLOC, MTHP_STAT_ANON_FAULT_FALLBACK, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, + MTHP_STAT_COLLAPSE_ALLOC, + MTHP_STAT_COLLAPSE_ALLOC_FAILED, MTHP_STAT_ZSWPOUT, MTHP_STAT_SWPIN, MTHP_STAT_SWPIN_FALLBACK, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 2a47682d1ab7..6db73d2d0962 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -615,6 +615,8 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name) DEFINE_MTHP_STAT_ATTR(anon_fault_alloc, MTHP_STAT_ANON_FAULT_ALLOC); DEFINE_MTHP_STAT_ATTR(anon_fault_fallback, MTHP_STAT_ANON_FAULT_FALLBACK); DEFINE_MTHP_STAT_ATTR(anon_fault_fallback_charge, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE); +DEFINE_MTHP_STAT_ATTR(collapse_alloc, MTHP_STAT_COLLAPSE_ALLOC); +DEFINE_MTHP_STAT_ATTR(collapse_alloc_failed, MTHP_STAT_COLLAPSE_ALLOC_FAILED); DEFINE_MTHP_STAT_ATTR(zswpout, MTHP_STAT_ZSWPOUT); DEFINE_MTHP_STAT_ATTR(swpin, MTHP_STAT_SWPIN); DEFINE_MTHP_STAT_ATTR(swpin_fallback, MTHP_STAT_SWPIN_FALLBACK); @@ -680,6 +682,8 @@ static struct attribute *any_stats_attrs[] = { #endif &split_attr.attr, &split_failed_attr.attr, + &collapse_alloc_attr.attr, + &collapse_alloc_failed_attr.attr, NULL, }; diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 61c6ef8fa604..78caa6d227c3 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1074,21 +1074,26 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm, } static int alloc_charge_folio(struct folio **foliop, struct mm_struct *mm, - struct collapse_control *cc) + struct collapse_control *cc, u8 order) { gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() : GFP_TRANSHUGE); int node = khugepaged_find_target_node(cc); struct folio *folio; - folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, &cc->alloc_nmask); + folio = __folio_alloc(gfp, order, node, &cc->alloc_nmask); if (!folio) { *foliop = NULL; - count_vm_event(THP_COLLAPSE_ALLOC_FAILED); + if (order == HPAGE_PMD_ORDER) + count_vm_event(THP_COLLAPSE_ALLOC_FAILED); + count_mthp_stat(order, MTHP_STAT_COLLAPSE_ALLOC_FAILED); return SCAN_ALLOC_HUGE_PAGE_FAIL; } - count_vm_event(THP_COLLAPSE_ALLOC); + if (order == HPAGE_PMD_ORDER) + count_vm_event(THP_COLLAPSE_ALLOC); + count_mthp_stat(order, MTHP_STAT_COLLAPSE_ALLOC); + if (unlikely(mem_cgroup_charge(folio, mm, gfp))) { folio_put(folio); *foliop = NULL; @@ -1125,7 +1130,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, */ mmap_read_unlock(mm); - result = alloc_charge_folio(&folio, mm, cc); + result = alloc_charge_folio(&folio, mm, cc, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) goto out_nolock; @@ -1849,7 +1854,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, VM_BUG_ON(!IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && !is_shmem); VM_BUG_ON(start & (HPAGE_PMD_NR - 1)); - result = alloc_charge_folio(&new_folio, mm, cc); + result = alloc_charge_folio(&new_folio, mm, cc, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) goto out;