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 03E45C83F22 for ; Wed, 16 Jul 2025 13:46:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7DF766B00A6; Wed, 16 Jul 2025 09:46:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 790176B00A7; Wed, 16 Jul 2025 09:46:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 658426B00AA; Wed, 16 Jul 2025 09:46:29 -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 4FB0E6B00A6 for ; Wed, 16 Jul 2025 09:46:29 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 01727160109 for ; Wed, 16 Jul 2025 13:46:28 +0000 (UTC) X-FDA: 83670252498.05.301CD20 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 917BD80006 for ; Wed, 16 Jul 2025 13:46:26 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eeJTjz0s; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752673586; 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=/1pctBA01/1zkmNnT64qP6k0VirtQtNBqmZ+pkk9rqA=; b=dS57olkk3O9VkeCQpOH+b0ilCCSBBcLU/UOT5PHAw8G8/tEw0WHX7equJHqmyz4Quddv+b OPAasJYDPMysdzSTP9uAJz8QqSyW8fXyHyviWGShRIe4T1iGKfMDKzvk4mtl9z3GtU8/mO CECIGLVsOLPTxGHXLOk3HbWav7GapNg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752673586; a=rsa-sha256; cv=none; b=gJWTKTzl1RcPqtfJrseglhkDL4Os6/srsGRnW0Mimzd7SP9PQrQ2cJmDqvt1KbAsk0FQt3 +vfl8zb1J02CGTVWu2T/AWdDh3MkcbKv/z8LGL+DZIZpj/ULkvrEmE3RyGjTMWubQNRxaV iOWzV1dgMuptoTDpz7L7ujZqQpBTJ7o= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eeJTjz0s; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752673585; 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:autocrypt:autocrypt; bh=/1pctBA01/1zkmNnT64qP6k0VirtQtNBqmZ+pkk9rqA=; b=eeJTjz0scSMBfKMaHhLCh5dtYOOrf1gNai6FCOd0CUxeKf0ktx/tkYn7/4Oe+bw1BVp6XJ h/YUi7qnQtzYHugnR2uSFaKpBFcrGDpkip5yEHqV4uoBl3mBp+vfAFMh8ulmDWZIgMj8Pf bCmrsc/cbY6jnrApMF8LaJuIc+KZJMg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-198-Q_qPkCE8O3uUALKk2dqX-A-1; Wed, 16 Jul 2025 09:46:24 -0400 X-MC-Unique: Q_qPkCE8O3uUALKk2dqX-A-1 X-Mimecast-MFC-AGG-ID: Q_qPkCE8O3uUALKk2dqX-A_1752673582 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4560b81ff9eso27158235e9.1 for ; Wed, 16 Jul 2025 06:46:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752673581; x=1753278381; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=/1pctBA01/1zkmNnT64qP6k0VirtQtNBqmZ+pkk9rqA=; b=T0IuHqHXlW4TgFCgBjxOGuTNqSr9sev3MuD9W8lPipJPmgJRS03OprZ+bkceXymZfu SayLWg16zBjVJMWBu2tNxCub1fFWoRNr4VIrwUiKexY+RBfqKAvssmrtwOeJYeJr1mOy Ii0riYub2a5jUKrBARQ5fZvvDsrCd1f0iiKM+e+XPZ3XPk8eHkDR/3ggjvK1LJ24NNTo w3XkgZVHs7q3PCJroscu1W7GYc+FOn3zJL4la2Y+r6IWn2r0w4WF4C1QEl2Ty1pzQnqb W8AQQR3E6OPgo7rKChdhRvR6kM+Bk456K9IPxtHXypT+v+EkC0TzWmHuns0Gp3PwLCeY aO6w== X-Forwarded-Encrypted: i=1; AJvYcCUI/uou/jg78TCx1I36tvhA7m9qxXXqGwwlNDqkOeWDI0hunf+nmBpxnwikRtYE+1iS5vr4DLFQSw==@kvack.org X-Gm-Message-State: AOJu0YzAj67OvlC8SMPJ751RbxdOo/xfpP7mrsK0hPjjxAYFBsg7CYRY gibo5+45/BoytLF0AulDzXnhE3u8yU4Dd4G0xSSVpGVyJGfLPT3aK9xXgxOVhjZz6ArlGyta54h wcsao6zfIRXPzLf0LoaMNnoblbwG2Let2XoLciPaBf6mjP0BC1SNq X-Gm-Gg: ASbGncvbyXWLWt31GWGJQktXFMm6gjdhK4XjroOMdwq8yjzhXtRUGPtR2HQO0TXrBTm pIIXUfEi2b9MAr8/x1TTqLH/2onq6V+cmApEeJJKOFDfjSWx0e82q+Ibybe4vzQQa4Czcp9bvPr VZfQLbfGRniwihyOOJhw/UmiBpirE3tzRkTQXjba0jtRtQB6U83UHtsgolIT3VjNNegdnDc4UPg GbOidzFvKWL6pD0XeoP7F9C46Kc+XBs8aoEgYZcqSV/UnUBBgDemW4kEHdy3V+Qf5FO9P81HyJJ /L6Adn8oJsemKgt4Svum6IKiQ/yHUJVIAbsXYuyAMlLbLGpdYvm7aAkYyvkE7SZYfSay0AU= X-Received: by 2002:a05:600c:c09a:b0:456:285b:db3c with SMTP id 5b1f17b1804b1-4562e3b8ccbmr23453825e9.3.1752673581425; Wed, 16 Jul 2025 06:46:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLfuwv8hTtlovE4F8p1OZCmeKNmt6dxGC9wD6r8RzyYXtB45fc/AjmHbpd1Pns9lK9tCcfyw== X-Received: by 2002:a05:600c:c09a:b0:456:285b:db3c with SMTP id 5b1f17b1804b1-4562e3b8ccbmr23453315e9.3.1752673580858; Wed, 16 Jul 2025 06:46:20 -0700 (PDT) Received: from [192.168.3.141] (p4fe0f26d.dip0.t-ipconnect.de. [79.224.242.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4562e802984sm21535265e9.12.2025.07.16.06.46.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Jul 2025 06:46:20 -0700 (PDT) Message-ID: Date: Wed, 16 Jul 2025 15:46:18 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v9 04/14] 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: 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 References: <20250714003207.113275-1-npache@redhat.com> <20250714003207.113275-5-npache@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 g3eXuA== Organization: Red Hat In-Reply-To: <20250714003207.113275-5-npache@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NWDKeQ5d83z2tf7LKj1eGrh1GIGy93BEhGLOvLYrRUc_1752673582 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 917BD80006 X-Stat-Signature: pzzoih4b4ts9ch1xjquoc9p7n3wx7hjo X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1752673586-939118 X-HE-Meta: U2FsdGVkX18NOqBazH4XM6PLzL+62EJRCSahnloPloTGx3TlqCm3Vg4tSninf/eR5IXDFMIc3ouSQFETOSvpdukfiL8DCbqsr/VUwXhi1lK6L9MvgQ3LHKMZBYP4dypzk1qbdTC5s4bt7aNP5VS2SNJkwc/tU2e1jUkWRqrMZ/F56BzmBcA8Qni5+Rk5GMXFEqCyiC6Jzp8WjGjOSPrlRjaSKB9AC1b+WW82fFWi8fhvbjVTEB3l8iRvf5mYGw9GV+nwtXEmwFO+Ma8m4hJBJr/Hl8ViMAb3iOZnYqzpY3fF3odcF+h2flg43FzBybpYf+sI0d3LReO/QQo1DCgpsvCgYF/MHFFWTOBkFYEOEv7387umrXgPGsYjWS1EQVM8ABs9ASBH+FC0z6dBFi2QDBa7eR/EzzhzNJSHzrd62jRmLuKZLUbIOFx332plP4jbJu/P5AUUY+FumekF7FCEQWqF8BdbuAy+r6Omy5AN0ibLIGO/qrVlkSbfxvses/zrHv/5Z3U6u1j3vBz/iPVSwx/QQLRyBJLMsBr3F5fWDbBJ17gm/QJkK/E0Kh4TzaI4uWk2X8ahmnExSr4Uv/5JX7YVgCx8gj8v0fg9mavIfMZ0CE1DZrcXD2FIOkPC2kyXe+2+RJF4YLwYxk0rCPWxZEvJtomHJbIeFJRrxvUfRc/yvunvEF9IT9bnblHuQqIS8Vn4LnItSspfi5IUS0ryJ+H5cqbFh3DtNIKmsaa8x7mjj3e+ICufDIqYCUPJm6EhbDusoedL8wmXVPlzItT9xE/D34ZU3WVvatl2wyZDBytktAteCYLsO/sXIWROX3KTO77eIa0RpBq8d79OzQJJd1ia8tXD+5gBcS0Q/OhONrNvEgLc5XYw3c7q23ab+02OeT8J/Pu5FJnsA1KrMeVT2h8n/YthE3kDfBuYQKh4dhi57nCD9KNTiXTO5+YS89AQNwgHNsF4LQNUXpUfBNu ZuclvNDw ADLQpsT77UjGPMKzvFz26Lv9QZfHoUsOBqnS9KWfKGAxXkyqrHTJXBpCDKziU24wlpUuQvBNNpvB7qT2/qfGdFhziZZpFH+myl6d3KtdNPWeA2FfdIVrMtkcghp+BlBbhPYXgSn39dvjcNffbfdBi8L2gJPf5dAHjoMbt7RthEMz5zXsUoYgdMefdr/euHdoLs4aSKhtCxqWMw96tMZyftRdN3FesRBHo1UMAVdT5YKFrZJTlPPgnFTN5iXJZaCDIU0t0d+GMzR74FLGf3Hs49jv2BG+KgHomFb2FKlHeJ2uo/wDSD23M6ttf1ZyET2yjHEisc0NpCfCLyka2UrQbR303hl/ezkCYp3s2hgbkhvoMueiKrdvZXBXPq5dnI31pSnOp9mS8f/qtjCkmDaBbnM0ujco/YnOyTzqQ73fuSqo0If83CmiaCE16zUWiEMyOi1q2oblJz7AAUybmiB8zbkt+qFol6++pCX8AIp3CBWKZDKLBc0JjDpyhhMpUMdDL82GuG1g2q4hK3f+TWSHVXeDvR2rajMRN5TuvK7JO2qZPXzE6IfKDh0C5cP/9IavZKHmSpvAmMYTkyrN0hFJ8CaxNl6rOHMnH215qpBqjiM592ysAWAqlP5xS+x2bTdIklznxhisLGWZElKpT+Swu57SkaTjzdn/Qx4xkFg4XpcmqScA= 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 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 for 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 = __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); > @@ -679,6 +681,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 fa0642e66790..cc9a35185604 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -1068,21 +1068,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) u8, really? :) Just use an "unsigned int" like folio_order() would or what __folio_alloc() consumes. Apart from that Acked-by: David Hildenbrand -- Cheers, David / dhildenb