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 85283C3ABC3 for ; Thu, 15 May 2025 03:24:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E85B36B00C7; Wed, 14 May 2025 23:24:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E11B36B00C8; Wed, 14 May 2025 23:24:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C3D0F6B00DC; Wed, 14 May 2025 23:24:01 -0400 (EDT) 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 957D96B00C7 for ; Wed, 14 May 2025 23:24:01 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7ACC414127E for ; Thu, 15 May 2025 03:24:02 +0000 (UTC) X-FDA: 83443698324.26.9232472 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 722C91A0002 for ; Thu, 15 May 2025 03:24:00 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eHtTjsr1; spf=pass (imf19.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747279440; a=rsa-sha256; cv=none; b=N9bCvwbyZu7vgG/ukXdxLZvjW96gv4ItkNhkRFvUAf4Djmo8iZ9jykTTnXa9BTAhiMtrrc mdMMdEVY6MAT0H32YZME2XICdTSirIF2xpMeWGZKB8BDmAd4zbYfKiSsAlpbnaSzifSkAB Fuj+FI4oaOjbV+uO/m267zUenlujfP8= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eHtTjsr1; spf=pass (imf19.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=1747279440; 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=PsANGthd/agErItVRASunv78tkLnfNiPJwd/K41Ki1A=; b=gz7dQTRWBIlqYTrqyy+0aDfCmLtXhr0gnDbpXmb01cKtPC2o1hCugnUWFjQspkxWcETyRG LHjL9AdBKZx+NqWfkQjv5H/DzzeO8ZnVqyWlWVj0zeWNcfDri7aAOghyPaohlV3HHPBlbc Ms/1UDqG/11XhF37K8tXAzg32fS9ER8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747279439; 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=PsANGthd/agErItVRASunv78tkLnfNiPJwd/K41Ki1A=; b=eHtTjsr1jIRBhKeoVeKp6K+O5LMBa9lxqhhdHS8IqvCw0JDmHFXmkaciElltvj+Cr2HIvo 3sm/gx2nxOIEuSmKC2tE/KqALJbQ0fS0TkwzFbK3zqWl3bo0psbUbIlftlV4A3ZbnOSo1L UY2Bt1PIZyOCEKT1XgNyEqWhQahFtkQ= 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-104-goIADGt7MDmoUPD-p9LRuA-1; Wed, 14 May 2025 23:23:56 -0400 X-MC-Unique: goIADGt7MDmoUPD-p9LRuA-1 X-Mimecast-MFC-AGG-ID: goIADGt7MDmoUPD-p9LRuA_1747279432 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 93BE71800447; Thu, 15 May 2025 03:23:51 +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 978C518008F0; Thu, 15 May 2025 03:23:36 +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 v7 04/12] khugepaged: generalize alloc_charge_folio() Date: Wed, 14 May 2025 21:22:18 -0600 Message-ID: <20250515032226.128900-5-npache@redhat.com> In-Reply-To: <20250515032226.128900-1-npache@redhat.com> References: <20250515032226.128900-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 722C91A0002 X-Stat-Signature: 1an6gcry14ysz6fi6q4eetakh1h9dfne X-HE-Tag: 1747279440-282561 X-HE-Meta: U2FsdGVkX18PEREmXsI2pTUSsWEiRyVvXu+1a4OAySdmMcLzufck1KfMQnd2EG7+CQmMW1cbXAd8foTd+lFSeRCmJ5YkQ9tqXFByFpOuFbMkqA5rKXp3yXJh1vQya0KF0KBnAaSgjQHVv71pIYCb4QW1MqFOrDCnhBc02yvSQeikGTThJ0OXgfvfNYWU43QpmzdG33Zgi5BUJZelzecGX0Gk//nX2g01jqeqfUFMQOAjBJAWi8U3HHpmBCEp7JhDXwHe4bh8PpeftAXtVzJzbXDwpY61EAfZhz/wnbyx9Bxg9F9JKB1Tmi5anNk3jFbHE7tvlSqJZtAhENDJMw+DGAHKZkD0U3TlfYQiVYM2xAgvXDhgPSViFUSZsRydUputcxR5h8toUoKSoI0cLdzmR4NgrYknxZ8Xif4Dek3BZhGbhki47tXEqJvItyMiXn5criMWikswQgFCwX8S7DM1JwHLfjRHjx3UO9EbkguYI60i6O9vicL1wghYdnz8GSBdrNSWGWJ0V8B/6+1RQnlVNkzqCDc9EwEzu9xI7ApmFRar5Elvqfvf52LbDtOWn7M9RqQa8xw2yeNfpQ6iqmJCdaqJTARrTGCHfJruQK7rnTjmVs38ImYG1HH85f+2+ooufGGgSL2iUlcUfrBRktVAQ66fKpb8BlvxzwiPJweQNHDrPdqN8L8Deg61vqmRVjz52PxYSbeAxrlEs7BXK7K+CTHZBc07XKvngdDwow8EE1Vhiv4n0D0K7ZKLazOMzH2w/GHy4mPic/6ixqR5sfBUZxEKcf3iGe10dSJzMyJwRpmygPDs5v0FVMbn6rgNC43Gy1cLSiztSPf3WUXZHNNAaVrZpdm7qUXTL4DrDZNHY6iVKosXYlPqVUWRIqGAxllh5tS9BF5MDsCNwM1eaBWgPyF6GuUPslLKDTHhggFIsyvezM47H5ozS18i8JLzELWcCfKBh+umFhDna9MAewZ uMt06Q0b 48ygHVlkBGGRu7FGXIqvdpC9ij2i+GDax0OYIgGWz2JtG+sX0/UuCG3MXP7/8gGg+NJ9xsimga3GxUT/ndt/6DPMi3myCqxwB49mlpFAwf/Q18Fxvx6rflUgStj7K0pfLtHcYBn08QqvwPO7pNDDX750ErJ9+0Vw8cYPNHPogvLEEmkDHfmbDM5zueg0X4sPGAxrYckP0FfHu5yx/MICP4yghDJ54qGAlvy5YIrFLs3tEQTupeXtvm30UBpYMc+JgXkgBhRPMw8/WzOvuhw4j/YnmRPAMDkl2zlN6CgZ3vshzbfUZrqRmVXC4wHDoE4r3TulJooCrslPne+NMRR2ZMg/ZJWqYXobtfBWOSyoXk3Jq5Jc8i0fPo6De7fK9GQVufngqkfw6PVP8SoE+Lq9vZH60/SFfdbiBJWU/3aiiz+aao4037lS/znsZxktzqesiIkD0r1enTpzKY/1ByivKnfaFZ053dQqPlR39s70kxvSggLoLJvK0tqxdBvd5Lxs0cweKMzODe4uIv0gmdTWcxkCW0A== 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. Reviewed-by: Baolin Wang 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 2f190c90192d..0bb65bd4e6dd 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 d3e66136e41a..177f0a78666a 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 0c4d6a02d59c..cf94ccdfe751 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; @@ -1847,7 +1852,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; -- 2.49.0