From patchwork Tue Feb 11 11:13:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13969516 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 4502EC0219B for ; Tue, 11 Feb 2025 11:13:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 939356B0082; Tue, 11 Feb 2025 06:13:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E8586B0083; Tue, 11 Feb 2025 06:13:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B09F6B0085; Tue, 11 Feb 2025 06:13:58 -0500 (EST) 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 6344D6B0082 for ; Tue, 11 Feb 2025 06:13:58 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DD2C6814B1 for ; Tue, 11 Feb 2025 11:13:57 +0000 (UTC) X-FDA: 83107404114.13.002B2C0 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf16.hostedemail.com (Postfix) with ESMTP id 24F3F180012 for ; Tue, 11 Feb 2025 11:13:55 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739272436; 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; bh=SEzyZQvQrnLJNxZJEbAjPzV8PlKSlEoBugccDpWTTt0=; b=rWVHcwie6Jmqr72ujjwkVvw9hna6ku+Po7aTGT0Jr3XMQhZJSJdiRa5Fg2o2ezYXxj8C2p H9OK/CZUK88w9vcp9G4kadQw3LiAXdoVmJFVQwRcAw9pCbjiDKr9uqQiaLTZXlYgWCK1bz adFQrjogGUjzXCJniSTXqLRkZrLWp/I= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739272436; a=rsa-sha256; cv=none; b=vzvIION/iDlY0yuM4jAvKxRBeL/ssiAh7Zx5lWsBKfbJwI1GGFEODCUGVovCTRF2UIm9bP MAobApBmNr09Ar/L8fR4LjzuHFg5UgG7Im/jX4P5spghBOn0iLIIi0/CEjMa2/BAt+4eLT V0UwqYWxRR7oFY7MqoDrcTudBLfatFA= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9B3321477; Tue, 11 Feb 2025 03:14:16 -0800 (PST) Received: from K4MQJ0H1H2.emea.arm.com (K4MQJ0H1H2.blr.arm.com [10.162.40.80]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 24D5F3F5A1; Tue, 11 Feb 2025 03:13:44 -0800 (PST) From: Dev Jain To: akpm@linux-foundation.org, david@redhat.com, willy@infradead.org, kirill.shutemov@linux.intel.com Cc: npache@redhat.com, ryan.roberts@arm.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, cl@gentwo.org, vbabka@suse.cz, mhocko@suse.com, apopple@nvidia.com, dave.hansen@linux.intel.com, will@kernel.org, baohua@kernel.org, jack@suse.cz, srivatsa@csail.mit.edu, haowenchao22@gmail.com, hughd@google.com, aneesh.kumar@kernel.org, yang@os.amperecomputing.com, peterx@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ziy@nvidia.com, jglisse@google.com, surenb@google.com, vishal.moola@gmail.com, zokeefe@google.com, zhengqi.arch@bytedance.com, jhubbard@nvidia.com, 21cnbao@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dev Jain Subject: [PATCH v2 01/17] khugepaged: Generalize alloc_charge_folio() Date: Tue, 11 Feb 2025 16:43:10 +0530 Message-Id: <20250211111326.14295-2-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250211111326.14295-1-dev.jain@arm.com> References: <20250211111326.14295-1-dev.jain@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 24F3F180012 X-Stat-Signature: qunomz3mcujuqom5rf5h8o3s7rbdpiws X-HE-Tag: 1739272435-823550 X-HE-Meta: U2FsdGVkX19pxt0/+ZupT4msfHiRdnzuY18jW6keQ/LS1f9gBperWRV8kmd/Nzhzp2g1w8WgUFy8FoMG6RTRF2x9Qa+/LjrztJs5Yn/0YL2rMCVpaWBCAbuM8xqgbt+FWNpVTsgVyXt7F9+Rnt7FcsfwTvIwZSQYE2w+lRG7ORd6OkAU1AJBsAsVTxxXSKoPf1Rjt53cHya8sUYvFKlHnZ5Ard5wa3D/aMM2pEQJjKopPMLo+GoLjZ1mD7ZHCH3WUdwvbVEnGaLz4rzVQEbLavvHsV/bmvGQvkNNdKhR1e8nYpWsFCJImkd1PBVHgM9OrTKYzWetKV8JXOOpdMKkYFCIJl87tGP+JOF+MikkhvBzQXkzCrHA9WGFgt2+b+UcqYfPltJybNMXA9buQB3xr2Zzb2NpdgYnaAtD46huFiytFwr7doOxbmKh2i8IpLZ25Kpxp7fwm5Keb1rRHRZ4idyJmAQwrcpepWiAgTnsL3MSNkMvn4qM3AUBmAoMr55kuecRDF8AFIQ/24Z4l1Q0ornGC4ahN9hWB0GeVF+KLImI4s4Yq2MUKnKd9fedyCAtha917pVfNprM4+dOi4ZAqhNucOoUTr8OWjqNpSoslWzY+m2WB5YXB8egMcGRVPLOhjX97Mxhm7C55y9cfpR9vN1DbxtzZll1SmYZ/6IAfTQhPmH08PCKhTSJuLL3gOF54f4goKKGS0hXoXVl/vbYrlBSEK/mVEXCHBWGzblKI604QojybgBcJVHrDf7cfkTNLmAaEJLGG0iDyGOgrVEME78e5CVjKfS5aPeNMjKcFDLbGytk6GLTUIrNr2FrYVX73S1EVaZYQW99koYinkpIuxwCI+Njv7DAtKTFZh+TRico0PFxap7kPumyr+4+Pa5oZUOqOav5m3+Rajtxa6AcLw0kqzQzPXMizy8WnMHEhxH2DzZIVYWANwwufwyMvyLlQQz96F6hcVZjRJbKyez VaqR8cmo 7S7zVv1GCnukeBZpylTT/yvmFAa+dW9hnFJm7lg5eawbHiQKNClI+ijiXozgQPeCUCIvKRkuuhhbkc8bFEx5mTB6bPR6aK7K+WIa9P5o+I4spxMEf5+CkyPNwVOhOCU4ulCS6Ma/2i9fIvIoMD7c1FlKTWyp4L6ybEzdWIhG/QJxNUL/M3QlZIaTbSmqxjZVBJO8GU6iRT6/xUYfMSPwpIxYh3c9GC1R/LZD6nNKDIhBFfMZTVG669Jwts4BwPSKaDW1gAbMCVEdnuddkqt5CYcWkSQ== 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: Pass order to alloc_charge_folio() and update mTHP statistics. 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 93e509b6c00e..ffe47785854a 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -119,6 +119,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 3d3ebdc002d5..996e802543f1 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 5f0be134141e..4342003b1c33 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) + int order, struct collapse_control *cc) { gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() : GFP_TRANSHUGE); int node = hpage_collapse_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, HPAGE_PMD_ORDER, cc); if (result != SCAN_SUCCEED) goto out_nolock; @@ -1851,7 +1856,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, HPAGE_PMD_ORDER, cc); if (result != SCAN_SUCCEED) goto out;