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 35B7AC83F1A for ; Thu, 17 Jul 2025 07:22:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB6716B009D; Thu, 17 Jul 2025 03:22:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C66A46B009E; Thu, 17 Jul 2025 03:22:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B55736B009F; Thu, 17 Jul 2025 03:22:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A051D6B009D for ; Thu, 17 Jul 2025 03:22:54 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 544A0805F1 for ; Thu, 17 Jul 2025 07:22:54 +0000 (UTC) X-FDA: 83672914668.30.8202909 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 50B51A0003 for ; Thu, 17 Jul 2025 07:22:52 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HACvS7fE; spf=pass (imf15.hostedemail.com: domain of npache@redhat.com designates 170.10.129.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=1752736972; 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=JFbE7+bxkztH8ht0A9j4wnG3HbzAi42oef01y44iq/o=; b=JQEUNWWHnfaT4yvRRLOejrN832TNkeSf+L8fM/cYK1+/B+7u2CYVn9OCZZWwivR8MUBu+m GE2dz1WrRuv/ujHx/JN5mPj/q8MAOdUmCo8DeIOG2zHLkM1WxDAZmfIeX+sRestpGMrPkZ 9rVgY7CD9CMEXL7/liAluR71HEoFCVM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752736972; a=rsa-sha256; cv=none; b=QYwIopilm5i15Pb4xfwd4hL90ORmbbZu8Q/kdBO13KsqCzMawKe+UvrJx2N7PwRlRmfa48 Ak/7UPKdkc3n1lTZfsW3zjewGuOMBLWkutNWqArpZbB0ZzOX2zmxLKYVa5Il2PAFRgQpBH DRDfvBnAQ5IUK1MZF+TtGcC4KK21qOw= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HACvS7fE; spf=pass (imf15.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752736971; h=from:from: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; bh=JFbE7+bxkztH8ht0A9j4wnG3HbzAi42oef01y44iq/o=; b=HACvS7fEYXYT4oVhPqKIkPtYwjnyQqZZv28u4FMXV+aw1Ruu2ZA1naAREhMhiYy5R5pxg5 +zaTxTDKQPYTSWBF4b8mFMA72CTDlNBIz2iOQ9BkosJbaXBj57k0IoK0i8UW6KNCjdMG9v sVhmhHt+Kk0qhhW/XpNBT5EPqrZB5io= Received: from mail-yw1-f198.google.com (mail-yw1-f198.google.com [209.85.128.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-207-DCO8fFaqPTeZmpUG2zGwJg-1; Thu, 17 Jul 2025 03:22:50 -0400 X-MC-Unique: DCO8fFaqPTeZmpUG2zGwJg-1 X-Mimecast-MFC-AGG-ID: DCO8fFaqPTeZmpUG2zGwJg_1752736970 Received: by mail-yw1-f198.google.com with SMTP id 00721157ae682-70e5e6ab756so8244247b3.2 for ; Thu, 17 Jul 2025 00:22:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752736970; x=1753341770; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JFbE7+bxkztH8ht0A9j4wnG3HbzAi42oef01y44iq/o=; b=ih8KhSttAsLCiCInFjHPIflcz0Dcnv0hcCtutHpUY65vhXzsDQGreCa87KDsUWzrDh 4tk37ze+bmlGkg8NwXcLobDOiNBrWlc0fDmT16N8fkIUzsR3H84AD0p+Wv0LEJKFtT9L /8fvcs90ZqZCNR0aAZJ7cNtj0vmH1sqUDIVhYyah6TCRzsaCBZ6qI7JMZay9VH3b8FGZ r7Ie0Pd9vbeVkS/ahwy7KV9ef8Z3dc1L6RrTQMH0nS0ZFZJMk9BjAemOg8rkiTIWSrP2 /YAU5UWYJmVkAUsN/a7roXot296MjI1wC7zwoMrNDT7r4vervup6eVNlyfQjzzwShWQS 1Wpg== X-Gm-Message-State: AOJu0Yxr6HpIeYGkRr3zW1xAvExJMKHyPALQPPqAuYoO804xsPGSfQ1O Vpzz5fzezEHrNL8swnr8nX+ZVPrsutTKIuLP8w8MXEbORq76+ksiUIz2T16od7CLm7BDmXw2rG4 qfo8RNG64Hpm1WemnvXFlLg0T3SNFeSt1kQ4BtxddQLO5WM2LG00uKvxxEyOOqyIB8j2bDxxnTS 3hkrwD89effJRF06JQ3ztIdT58J6o= X-Gm-Gg: ASbGncu43U7jGYrss5Wym7Z3szDfnwEyBWg2CxFCkp2wcOx6MgB/oB1goHaLlV7wouM UQ4j2kXe2FVotfIVlJzT0ZGOfAmp+zZkCGPeu1LJJj7257dsOspc6UmBAAb9Q2so9//hQIBLXzk EO3RArIyWyBybuByokf74boqg= X-Received: by 2002:a05:690c:350d:b0:718:2154:62df with SMTP id 00721157ae682-71837469c95mr83297557b3.35.1752736969970; Thu, 17 Jul 2025 00:22:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTEQOqXObebRqrlKJLemLbpJQWqKxX4FiFWdy7vlPZ029cLEq4+lOCKX4kkTmc9Zh7ynQj/lyoUlwrfL87Fyg= X-Received: by 2002:a05:690c:350d:b0:718:2154:62df with SMTP id 00721157ae682-71837469c95mr83295897b3.35.1752736967211; Thu, 17 Jul 2025 00:22:47 -0700 (PDT) MIME-Version: 1.0 References: <20250714003207.113275-1-npache@redhat.com> <20250714003207.113275-5-npache@redhat.com> In-Reply-To: From: Nico Pache Date: Thu, 17 Jul 2025 01:22:21 -0600 X-Gm-Features: Ac12FXzL2cbWnmcpfj5Yy4cS_OOfF-n9brr7FXMARu3knPEuWSWCEGWa47WO3XM Message-ID: Subject: Re: [PATCH v9 04/14] khugepaged: generalize alloc_charge_folio() To: David Hildenbrand Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, 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, hughd@google.com X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hZzHBsxiQSBiK_-ogX01E3Si9UWPComfjdN-AMRfK38_1752736970 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 50B51A0003 X-Stat-Signature: d3u3qy5ddx59xaqeaprth37rs1adie91 X-Rspam-User: X-HE-Tag: 1752736972-228962 X-HE-Meta: U2FsdGVkX1+8cvMxiQbWXGD3CkBZLCKyFmOM8VQaHC/W/W+Bq6hjhvUi77S8SVD6nm5jM/W+3CYU97w/o8mF0/83YjACH3vzLKnFCh4zOV9/EGykSBjrRRivdYitHAEC6CyGBZb9mm/bcWuMQkweEZ/Pkh/xikd8BGrCkAK1gi8H9JggO0HziMBi6pclTO8uTGq1p/KBY8K7OyRk1zL9o1VL3U+/h+12n+hoBVi0Fxh2g1Q+/EGxB+jskAftpkPIBUT/jKhQUf76/+B7lcE637YVYLY21ZZ8KIfl8vqXrbMvsHOvQTVOf/BG/vAbvCiwxFVKACHMlDmUy6v9opUKdVrYhwfLzW38hRJHfOnqiMHCnAZ+099XSTPwpGqMj0QShW36eCNjm1OeHeOtjAoSTkSrACV6fs5cosQHOFZYiRs5QHQ5l9XC/ZhsNDoWe1nVzGEnWq5moeHphrBMsTfPgrEjuiWv4s/wozAmc8QrWe5PTnvY2b5ewLL4qqXHcBBAv129U8je3BSWX7MSDiIzJMnFUb1PFU9+Jxlj9dTSICZi3iz2loHNxILURnaTHktEoIX4RK4tm8+G+S7uS+yAhBoM2YTOA6b9Sh0E9Af5mSRwwfz3D0RjVkwyvOipfr04zSz7gFeHTwAB8JMowGcDHmfPY1U38twLjPpxa/ekVPLzXTEJ/MPmzxLZ/OIeTPR0TvLiOmR121gH+YQ7qs88SKOSSBDp9Lh7e4Ut+ddeF4P3qCWtUE/emvwu1eVmd/2RxcpqK9/apo/RbeakK8BlZ/YcrydPCPCpWul252ieG2uztW0MW5e41B6QpV7l7HwNQO7lYalAli0uL6hTEciX02uL6zdlFh+GnHYSdVI8wz+a0UBKX28U1TaqaCcRPVycCW+t67Gdfap86E60H1BJM4mpuWoOVj0aZv2V5Z4qx+IC2tVI3fUM6j2x3zZXQ8PD5PJRLynaCXvH1toDnVh q9WnWeaT RIgTEqDtz/3DGiwdH+V3xL0MIXNhIlE981IW9ACfDCMv3jfd6w+s5s9vjCIHLjkpLAAmfKZERLLVO2386UaKHoLKTnV+LCzQXpGUkZpy+w6dgm54= 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 Wed, Jul 16, 2025 at 7:46=E2=80=AFAM David Hildenbrand wrote: > > On 14.07.25 02:31, Nico Pache wrote: > > 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 > > --- > > Documentation/admin-guide/mm/transhuge.rst | 8 ++++++++ > > include/linux/huge_mm.h | 2 ++ > > mm/huge_memory.c | 4 ++++ > > mm/khugepaged.c | 17 +++++++++++------ > > 4 files changed, 25 insertions(+), 6 deletions(-) > > > > diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation= /admin-guide/mm/transhuge.rst > > index dff8d5985f0f..2c523dce6bc7 100644 > > --- a/Documentation/admin-guide/mm/transhuge.rst > > +++ b/Documentation/admin-guide/mm/transhuge.rst > > @@ -583,6 +583,14 @@ anon_fault_fallback_charge > > instead falls back to using huge pages with lower orders or > > small pages even though the allocation was successful. > > > > +collapse_alloc > > + is incremented every time a huge page is successfully allocated f= or a > > + khugepaged collapse. > > + > > +collapse_alloc_failed > > + is incremented every time a huge page allocation fails during a > > + khugepaged collapse. > > + > > zswpout > > is incremented every time a huge page is swapped out to zswap in = one > > piece without splitting. > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > > index 7748489fde1b..4042078e8cc9 100644 > > --- a/include/linux/huge_mm.h > > +++ b/include/linux/huge_mm.h > > @@ -125,6 +125,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 bd7a623d7ef8..e2ed9493df77 100644 > > --- a/mm/huge_memory.c > > +++ b/mm/huge_memory.c > > @@ -614,6 +614,8 @@ static struct kobj_attribute _name##_attr =3D __ATT= R_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_FALLB= ACK); > > DEFINE_MTHP_STAT_ATTR(anon_fault_fallback_charge, MTHP_STAT_ANON_FAUL= T_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); > > @@ -679,6 +681,8 @@ static struct attribute *any_stats_attrs[] =3D { > > #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 fa0642e66790..cc9a35185604 100644 > > --- a/mm/khugepaged.c > > +++ b/mm/khugepaged.c > > @@ -1068,21 +1068,26 @@ static int __collapse_huge_page_swapin(struct m= m_struct *mm, > > } > > > > static int alloc_charge_folio(struct folio **foliop, struct mm_struct= *mm, > > - struct collapse_control *cc) > > + struct collapse_control *cc, u8 order) > > u8, really? :) At the time I knew I was going to use u8's at the bitmap level so I thought I should have them here too. But you are right I went through and cleaned up all the u8 usage with the exception of the actual bitmap storage. > > Just use an "unsigned int" like folio_order() would or what > __folio_alloc() consumes. > > > > Apart from that > > Acked-by: David Hildenbrand Thank you! > > -- > Cheers, > > David / dhildenb >