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 3F4E0E7716A for ; Tue, 17 Dec 2024 06:53:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C60B46B00C3; Tue, 17 Dec 2024 01:53:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C10EC6B00C4; Tue, 17 Dec 2024 01:53:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD8586B00C5; Tue, 17 Dec 2024 01:53:32 -0500 (EST) 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 8FD596B00C3 for ; Tue, 17 Dec 2024 01:53:32 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 443EDC020B for ; Tue, 17 Dec 2024 06:53:32 +0000 (UTC) X-FDA: 82903533888.13.9CC7F03 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf25.hostedemail.com (Postfix) with ESMTP id AD400A0005 for ; Tue, 17 Dec 2024 06:53:08 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf25.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734418397; 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; bh=2XJIwRqN7NwfTdkX/Ej7+xtYnM3hCMrapyGBPcQwF6k=; b=ZH2BXkGNmir0ELKAhD5blh4Thh6h7QuZ9EdUBJPVh56ii3Btyb3NBwHCUl5mQ8GHc4ZPQy +cQh5Y+awakXw1aBtyXP1XJt2r8oxnJG/5hjhs8aF7xU8nfUHF9wAEMH2cwzHZ7m8QsKz+ islyYmIkfJH76cIPzx3zUYZzcj9HZnc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734418397; a=rsa-sha256; cv=none; b=cBIy61eaHOQsff+Nwo1MBkSJWsRPH5XkbVPMQ0331Slr8eZB15uEvWzDYPKpPcxsr+8k5I edBzCrEvUTGFWB6Y8ZHe3vovk6iMbKzWBsVtD0CZSu0kcJOzkaHiJe0N6/bUfOuEXcIuyS gfSVfCejFrzJ+2mRIAcg/DceCGgAF6Q= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf25.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A19701007; Mon, 16 Dec 2024 22:53:57 -0800 (PST) Received: from [10.57.91.184] (unknown [10.57.91.184]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8D7B03F528; Mon, 16 Dec 2024 22:53:24 -0800 (PST) Message-ID: <46939efe-cf79-4dcd-9e47-9340956feb03@arm.com> Date: Tue, 17 Dec 2024 06:53:22 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH 02/12] khugepaged: Generalize alloc_charge_folio() Content-Language: en-GB To: Dev Jain , akpm@linux-foundation.org, david@redhat.com, willy@infradead.org, kirill.shutemov@linux.intel.com Cc: anshuman.khandual@arm.com, catalin.marinas@arm.com, cl@gentwo.org, vbabka@suse.cz, mhocko@suse.com, apopple@nvidia.com, dave.hansen@linux.intel.com, will@kernel.org, baohua@kernel.org, jack@suse.cz, srivatsa@csail.mit.edu, haowenchao22@gmail.com, hughd@google.com, aneesh.kumar@kernel.org, yang@os.amperecomputing.com, peterx@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ziy@nvidia.com, jglisse@google.com, surenb@google.com, vishal.moola@gmail.com, zokeefe@google.com, zhengqi.arch@bytedance.com, jhubbard@nvidia.com, 21cnbao@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20241216165105.56185-1-dev.jain@arm.com> <20241216165105.56185-3-dev.jain@arm.com> From: Ryan Roberts In-Reply-To: <20241216165105.56185-3-dev.jain@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: abe5g9pmkdwyu5kuugqm9ioaociz716b X-Rspamd-Queue-Id: AD400A0005 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1734418388-399727 X-HE-Meta: U2FsdGVkX1+aPUXVYhrLd16q2aP2OKZ0fzahe/CEtOaUUv4RBiuYazvNWN2R4QWarbtQkVLsbHpO5XV0sTCqtnSvJ9L+BHUe9fbdbF0J4zoGaBhWLVILdqmHIn0b0csYUsJF330KrvL2kjbdoaISy353+/TV6gRNJbUPFe2mkIQTOxR6pbJuaAfMqqkgcAIYWDfHx8CV4PC0du37EWYIDj9B+5VGzClwTki0hnuJLCQ0Qe9qeHeY0CsWGvkcOpO44Z4yw/Xy+KY0hVnscCJ2TfcvxlSVgQCzjvm6kK8oEZ+8/9v9fyUNdVcvM2fhCLiT4I5NdQRt2jOb1X2S4O7Z6U9Yo7FfKBMVw5lGiadK6YPuj+mY1Ne3ActqA1r8pghNzM6BelF7lcRYRfBr7GZUW41G/Sn9j+bO8Ebs8O7NQa9M//NS8Pjeu9mySAS7j0LslPzvaK/QDkdmT4u3v3PYLo7JVAOiHieyyHNj45EwVScdl+ieMnN57oG0LYATOvW8zms05WtJSfcYO/8xPz0+QzyylruoWJ70oS589CaCsVK1i6+ALAmO0dcdw2Guf5tCQFKfCd5iEy0lhLg/2x6JrRf4yGqBYH1DnO1eU7E9x/+dRs3A/mOkvG6AjU6gt0eFVkXavnwhrLep41EL6u/DIB/KBoIC3oOhVgzbq2K8TcQDgdCiZfIrpOoUTT78fIJpPJK3Rkzh8CKMcLIy+Aa9levrkplJYe2t1WhtpREbWY2OMVJ/jMEufklit5gWKrgLVhpmBrB2aFFw549EptiDqpEg9hpKS9Z9h6P0Rm0VBYlg3Qi/bXI7044TaB3JPlJZSbFBiz0qT28wmdnqsrMqzKnJN+TPUoptv9Na0C2NUqpF1l+0FBWQ1XoP6gytLnkgc25DJhXCkCCVXMBkBuTkDYsU2Z6fTD5brGY5D03zCMxMGqoRurlp58IRBnGiZ5pYW1A+iAcqulDIiRKHRN6 l8l+ZPsL eUHezg052OPYF27FshYNvJRFswe8DHNMJOSC0qamv0ZWTis8ygHEg2e9Vo1OM9KdrhW9vwucXWEHtTALJEoS+FnjrZALFyb+HOKMYXHxJH4bbmqa1adlqA/7iOcRgAD90UyzeER0W30UJhPrLpdc7BQkdUznz3rg2G5+H9TpnORwAySTTOoQyPlUui35WrVnixfHcCeWjmpoEwpbeg+w14nQu36kjZ1SbOu7PcK3lJiwpIfBRowkw8lWsvn4GmjBWmQMqjaftTEgaLXVb6MmML0eeCthxQi6KlHa+vlxLcEGDXzhyRR198GBUz2anEjLfsUYflDB+jw/9dKZch3TWah/jGqKBVtg9z2H+OmV8SgqYz2GB4xyZFi3OXA5j2xnq27dqM74ry5uoQ2q0cM2lOyrvw0k3sqZGTGuteu/UqkEZwIFryy9plyFAnE6+kkAEx68v 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 16/12/2024 16:50, Dev Jain wrote: > Pass order to alloc_charge_folio() and update mTHP statistics. > > Signed-off-by: Dev Jain > --- > include/linux/huge_mm.h | 2 ++ > mm/huge_memory.c | 4 ++++ > mm/khugepaged.c | 13 +++++++++---- > 3 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index 93e509b6c00e..8b6d0fed99b3 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -119,6 +119,8 @@ enum mthp_stat_item { > MTHP_STAT_ANON_FAULT_ALLOC, > MTHP_STAT_ANON_FAULT_FALLBACK, > MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, > + MTHP_STAT_ANON_COLLAPSE_ALLOC, > + MTHP_STAT_ANON_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 2da5520bfe24..2e582fad4c77 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(anon_collapse_alloc, MTHP_STAT_ANON_COLLAPSE_ALLOC); > +DEFINE_MTHP_STAT_ATTR(anon_collapse_alloc_failed, MTHP_STAT_ANON_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); > @@ -636,6 +638,8 @@ static struct attribute *anon_stats_attrs[] = { > &anon_fault_alloc_attr.attr, > &anon_fault_fallback_attr.attr, > &anon_fault_fallback_charge_attr.attr, > + &anon_collapse_alloc_attr.attr, > + &anon_collapse_alloc_failed_attr.attr, > #ifndef CONFIG_SHMEM > &zswpout_attr.attr, > &swpin_attr.attr, > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 95643e6e5f31..02cd424b8e48 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -1073,21 +1073,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) > + int order, struct collapse_control *cc) > { > gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() : > GFP_TRANSHUGE); > int node = hpage_collapse_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_mthp_stat(order, MTHP_STAT_ANON_COLLAPSE_ALLOC_FAILED); Bug? We should be calling count_mthp_stat() for all orders, but only calling count_vm_event(THP_*) for PMD_ORDER, as per pattern laid out by other mTHP stats. The aim is for existing THP stats (which are implicitly only counting PMD-sized THP) to continue only to count PMD-sized THP. It's a userspace ABI and we were scared of the potential to break things if we changed the existing counters' semantics. > return SCAN_ALLOC_HUGE_PAGE_FAIL; > } > > count_vm_event(THP_COLLAPSE_ALLOC); > + if (order != HPAGE_PMD_ORDER) > + count_mthp_stat(order, MTHP_STAT_ANON_COLLAPSE_ALLOC); Same problem. Also, I agree with Baolin that we don't want "anon" in the title. This is a generic path used for file-backed memory. So once you fix the bug, the new stats will also be counting the file-backed memory too (although for now, only for PMD_ORDER). > + > if (unlikely(mem_cgroup_charge(folio, mm, gfp))) { > folio_put(folio); > *foliop = NULL; > @@ -1124,7 +1129,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, order, cc); Where is order coming from? I'm guessing that's added later, so this patch won't compile on it's own? Perhaps HPAGE_PMD_ORDER for now? > if (result != SCAN_SUCCEED) > goto out_nolock; > > @@ -1850,7 +1855,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, HPAGE_PMD_ORDER, cc); > if (result != SCAN_SUCCEED) > goto out; >