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 F2D2FC369CB for ; Wed, 23 Apr 2025 07:06:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 717B56B0008; Wed, 23 Apr 2025 03:06:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C40C6B000A; Wed, 23 Apr 2025 03:06:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 565CC6B000C; Wed, 23 Apr 2025 03:06:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 35FF66B0008 for ; Wed, 23 Apr 2025 03:06:51 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 45EA65F171 for ; Wed, 23 Apr 2025 07:06:51 +0000 (UTC) X-FDA: 83364426222.09.B4D5343 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by imf20.hostedemail.com (Postfix) with ESMTP id B08A71C0002 for ; Wed, 23 Apr 2025 07:06:47 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=slQg4ga1; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf20.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745392009; a=rsa-sha256; cv=none; b=WJgXs4mICVtuY/6kxwg3cnvhyLIh/L0L76otgiR7DSvR8q1YlTZhkTohJlVM4/eoqG95C5 Ep6q4DRp5zb9ITUIShMMMwWxPhO3yBm/540Hpt1AZhP3y7kRqyPQBVcQGa45iP6dUi3Yhf JU+IWrHqd1ee845Bz1ZwgkV1kuzpdp4= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=slQg4ga1; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf20.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745392009; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=thXgRC2w3R+DXRSmVN/fbZ2OtHbJLiM3ElorRiOdk/U=; b=Na8XOplmXzJOZqSU5bx68RaQlgXGQVJ0yW5tSh8FtbKlJieDGo4DiHpZcnOhYA7eLjAznT rEgncDsrr5qQVLMHIWlTxXA4+pZFncJFK98whSlVDcoGPAnv7lwH0jpHbVlHG+n9HTBDSs 5yTMcU8KePQhoQ32x/E7dpMJ61uw8Js= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1745392004; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=thXgRC2w3R+DXRSmVN/fbZ2OtHbJLiM3ElorRiOdk/U=; b=slQg4ga1h3LZUG5WyP3PqkNu7di1eGoCEVTPCCkruUOdVwbff4rnweol7CjDiDXXRGP8Z/rKxA8ZvgwgSJ48LMIMCxThYS8kCqcMb7f3ZhvcpS90TRhUyX0S1PWA7D9Jcw8FH2IqjEZb8uq7f/1RNiB3wOiBZ0wNPlhP5W1B5nQ= Received: from 30.74.144.121(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WXtXK1g_1745392001 cluster:ay36) by smtp.aliyun-inc.com; Wed, 23 Apr 2025 15:06:42 +0800 Message-ID: <977ef858-ea03-4ea7-9420-6275ecd6a40d@linux.alibaba.com> Date: Wed, 23 Apr 2025 15:06:40 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 04/12] khugepaged: generalize alloc_charge_folio() To: Nico Pache , 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, 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 References: <20250417000238.74567-1-npache@redhat.com> <20250417000238.74567-5-npache@redhat.com> From: Baolin Wang In-Reply-To: <20250417000238.74567-5-npache@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: B08A71C0002 X-Stat-Signature: xm97cn6j8npdo9pswrye19qzgdm6qgiw X-Rspam-User: X-HE-Tag: 1745392007-287597 X-HE-Meta: U2FsdGVkX19rVrqe3RwbFMXaw/KIE057P1MXumrZXETy144jJXvXfkOE2vEvyliNCpyTl7p4WOvz1uenHv7bmwg7bCm8CgOsf4dwS44RDOG9ClHHmWlJ2aTATyaFNoyrcp8UH5ZWw7d1Trsp79MbY/I7v8pVs0bcAjmnE5TLFVM2E9JMLUxz7NoyPFZRuHi6PPBmwrmxsJGnrF9OqGH/HoQyp7BmFt4p40dQA/XI+b9A/vOkXpX8Der7SlzZMAvdvKANfOsgbtsZBmqhGbOthI8cxn1sfRjXTfQki0Va5akksrWUrvqPFB/gSbgNARKtujNdLNisFTvOuayVP0zhqeJATYn34bavgPjXHL7gFmEBi2UVY6YL7xU0uoOdhsAPn3QGyIN1GZnI5zRZPsvRAzH0WM09IYAtDJNSf7VCgfvkcqAA9X6xM8DxKJ4LqNyoz+yk3pvrvZ9xXae60kgb5xwB5wUyAVmG17vxafoGREg6RLtiZm3yKcCh54REULIpOuxW6rqCaxOcTTUD/PO5OALdCr0deaJKkYHPTjTK3fz/WRwbP2HS15Be8VueFHB+Eb6TJCYby1bgGWyxtcN/x5SXmqyl0NBzQh8fFT36i1w/EeFlKHoY7hBYi5UixbzibKCuTjdrON/zXGS8FZV6zAuHRZ3u3jEadI4IlS8+1MV56pRvmh2sQBK8BnBSkukgwzTjvbc7m3D+3ekG7DZWP09w6NY78LWj7eW2rwa/xw0AWYWvUys4+h6eFGZXUkYDK3gW+npUEI3k+HB4nRa4JOBO0LnVAuh+h2fF+X41W6sgv834sYmFgIV/f3pRcZQmbaJSSUYvug9yAywIcfPcN2eDTALMi39jUbIxqFZnmpy9AAfMsD4BN1o3EX2XCGm6a6IOiYlAoO2A2NBAFjmQoSRP4p/CQICy5zEvDtzIiKUjWHcVql91RA3zMenMh3VQCDX3stR2UL/SMfztP8L rDaTTMHE pyJ4YsbG9qRb+9bAtISpSvhfREr8/09X+kLX90Zc+KQk07v4fEV3J8RxWbsw7DiaubfGQO6auWHCnv426IOAL+/iSry74RWlIE8p22D3QmmhcAm8iAipUYDxDJujWWzAkok+nWXwwIVvY87+GmokaOiG9lmo8NUBcI/Pm0EsQYBBwEI0OlILL0IWNEC2RFJTq3KUWyqUwmWSjETmg6mxLOApL+NioFQQ3RBeyFNo3ZVCMWv/hZTh+cq4xPVRLRjg73tPwfFG017PA0UKiaezSHQI+Pg4AO01NON+bGc70+DWFVpNC0d0tIG84B3HM2wAprb+86KBwjUO8RugivI1Qdr+foy3dpmoe7huiP/I+q1di+o9bgqV7oWz+2cVax8PKqCBLY+fPR3wGzncCw3jTeZ8di0OgtkXSa8oMjtfhD3msU2cNwcUGL5ij99j9DWTF2ffugMUSHlgfVkJowQwJyh4KnA3/jdHLNSoPuLxS6rUDrNrZivViGTFckA== 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: On 2025/4/17 08:02, Nico Pache wrote: > 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 LGTM. Reviewed-by: Baolin Wang > --- > 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))) { Nit: while we are at it, why not add a ‘MTHP_STAT_COLLAPSE_CHARGE_FAILED’, which is the same as anonymous and shmem mTHP allocation? > 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; >