From patchwork Thu Apr 17 00:02:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14054626 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 E7463C369C7 for ; Thu, 17 Apr 2025 00:06:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F1B5280135; Wed, 16 Apr 2025 20:06:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 97953280132; Wed, 16 Apr 2025 20:06:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F30B280135; Wed, 16 Apr 2025 20:06:48 -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 5F90E280132 for ; Wed, 16 Apr 2025 20:06:48 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id AEC22140FBE for ; Thu, 17 Apr 2025 00:06:48 +0000 (UTC) X-FDA: 83341594896.12.D450DB6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id E5C45140002 for ; Thu, 17 Apr 2025 00:06:46 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=iLucLXwS; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf26.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=1744848407; 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=7xxSKiBkdmqkIjAIssZjRDTVvuT77x5sjso/cP0sO58=; b=i4bVc/OHW4wvVP/8KM6raR+e5vzTOfykVJzOwUWmkJw4mQmIfjrvvJKxd0luWkZkIrlRCg x58nby8XGRdMj2Z5z37MEYzv9tp6x8yDoLxipVfQYOncK6CnFN3rOaC5Uezea7d/D5KP2H ZCZ++WGiQKzpz9Wkmlr9tURRskj30Mk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744848407; a=rsa-sha256; cv=none; b=WUnDJ/l5A7IAfiyohc47fs2aBNKuulRJxIjD+NpEsIGC/4htjDA9eRjg4XrMdr5RF6jvxB LPlYp9o6xr+8n97bkTae3CmsoidZp5GBnTcgBykCrM0cVQcHHKpFsqBSbhPoUipLjQFC41 uHBA15CqLlhmCopk/b1nwLVTzTgXlcI= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=iLucLXwS; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf26.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=1744848406; 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=7xxSKiBkdmqkIjAIssZjRDTVvuT77x5sjso/cP0sO58=; b=iLucLXwS9x/8aSdF9JC9eKjB198rooKTdKuReeQLo2ZgePYqiY+/hNXf8kAm+UPlzKvDre lFiBNcpqtEJ74Zy8kD4/x95vmw1+EnBQOteEBhoy7U94fndmHJiP22R//r89ncaehxkF8D qn5Xx4nZOH1wQvNCQQwYJPXKFP6T0hg= 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-350-EWqX6UDENnqmnvHn5DKWzw-1; Wed, 16 Apr 2025 20:06:41 -0400 X-MC-Unique: EWqX6UDENnqmnvHn5DKWzw-1 X-Mimecast-MFC-AGG-ID: EWqX6UDENnqmnvHn5DKWzw_1744848396 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3F8EA1800263; Thu, 17 Apr 2025 00:06:36 +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 EA8DA1800352; Thu, 17 Apr 2025 00:06:26 +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 04/12] khugepaged: generalize alloc_charge_folio() Date: Wed, 16 Apr 2025 18:02:30 -0600 Message-ID: <20250417000238.74567-5-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: E5C45140002 X-Rspam-User: X-Stat-Signature: jsnan9qat57je6r9iozk4mnokdebzwmn X-HE-Tag: 1744848406-645212 X-HE-Meta: U2FsdGVkX1+Nep4WnhKADMNU1XPmWqScdCXtc98tkZ/HJ3cPkNcbDdkdiWzjeK5xaQ1jfnvpD/DyQMi3g122dlLQDLwuwRdRq10x+1INZ+qH8CrKKhEN95Z4OLtGiRrILc9+d2rkFPT/1K0mx1GNjeylOUTPKKc96fVPkMk12Nm2cdqD7m01CBCpe1+wfAsM3nZcidb7I9xDN3Lg7wsRKKkj0rkzVmNOEYKiHkUDIyoG6QD3JznLy3sZlSF4xslbydyvbsBTf56I48pM/aAkoQ9jCB678yitzTIc3FbZdxzYpgtAE48E+dvDrojoceupCVLGkWKSEgStk//v3HkrFhLkHPGo+PKq3vKPF/iuVV51314Cqa98ReAprc6oNu9bn0IgXe4/4VQ+rx7p0wuI46MM76HDCf1ohpuRre4WX3HzxLQm5qDDvth6x9rq/0MSUZ+Nyy06Rf/hNFDfIIsJ1nv0Lnm9Kq5oVqmXxoyd9Vx4+tRlW2Q6/hbgJCPEO6SOUhXsx6ptnXG8vmVsGyfHpYeWYqjPvUgTTRksGoTZQ/EBlna8hl6pddZipKm0A/qcCGpDDqL+b6avdgvR9pOJ66y65Z+/5Hwn8plE6EJ/wTB/KKkf9QJginnvIoDP9bVSeShJpQnESNUnThgYab8zA1Vo2lmDAILeC7lHF+ip1/eNtHRTQ3eLYEZO5i/HM1cLJ78xchkQTs9MziXJ6+/1xd9lImwD5PoCy0xU7Tefly/WuvCFb7sISgmI7p5/12oIIVdpM0DhINSsTtfG4EXhwMi4j3qI2vKkF8krYoyHG+y48tsDOO39hyvmYh9wad5pKNxrBNtPHAjcPHMnUD+SE/7f2/LWc+WpLt8r14mYGzLmH9DSbwdeR+3uAimpdhyeK1Ck6kE5soXJkmODjIKGEYop4cCQjMRl+k6eziT5giL0w3ywVorjWkuQt3mDzXGe5Y21CVfqihAREmJJ3iK kS61ifkl 19NDhSib4GB2ZYsak/mx6sunwc/SY0GM8GaWdoki+19Gsjhft3ALEufIXXcJPG/BE1rGnZafjHQuKnb12dvGoMfK8VHSovjpS47pS9K+Atsq2dUWrWkCX9OY56VrRNiO1lMHSQC8t18cvz5jOZB/2NRHfar6kds9yidimNXTiCZeFrCmY/8Ghd3OVwbR1noCUTs33dEqebwwBnuasIdbIW2acq5+kWNzMheA9yOxOSbOEtGFnbXGVc77rPsmXtxLI1hxhou+FHeGMQBH0ewSj36dDFN/Wdj+wFZH2O8sM2975zBsl7brl4V4tkJeav+sV9r8VV2KaUDOqS6NLMNWHTOHxPJ6yen/YcFu6B/4odWsqCimCxW6lDdDVlEzlfGra8ZkCKqQTCJMbD+z+4w7aQtSEpr81pcYdve4d3N1DXGeKsVjGDbD6tH3bilmu/jWqaWWMbFt14CQ315JmjcPqjS6aYs1PlYNIJlNxWX8GY+1PA89JwjvAAHexilLoPcA/vlHZ 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 f190998b2ebd..55b242335420 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 e97a97586478..7798c9284533 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 54d7f43da69c..883e9a46359f 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;