From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E8C4536D4EC for ; Sat, 28 Feb 2026 09:36:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772271408; cv=none; b=UowpCFdrI0nyQqvyrX5nUSema5+Rc9jI2y0BW+rG9bfpERLXF6poHoJPwmjuP9Rm+HiECGe1QfkaCcFp6Jw6JMuX+4fZkxGbVNAiB6mMFjkVWyZsz/KFGPEwBLk+tm2KTUrsEcyyoFdfWLtLTRTWztK28gDIFrW4vBbhvRcCDNI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772271408; c=relaxed/simple; bh=bmctxzQ5xC2Lp7DV8ma5qjn5WxQTIQfg3GrY7gxMr2o=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=PnRC9avwsQ8H6XWq7/6SBSrdJcGeyCmFPjoU50I8iSdmWoDz6hZx5vJhYN7McnTKhL7JLBBHTVFe6YwGGHDR3Af4Az0tAh7aSi6ujAoxVBWH/42fs7NqV0pD9i8L4eFr09x5Ncf8SG311fZHM+0MRNGKnDZLjlpbShjLzz+LVjg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=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 324851516; Sat, 28 Feb 2026 01:36:39 -0800 (PST) Received: from [10.163.135.253] (unknown [10.163.135.253]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 604293F73B; Sat, 28 Feb 2026 01:36:25 -0800 (PST) Message-ID: <2ecab533-0220-4a47-9d55-40826e16cf56@arm.com> Date: Sat, 28 Feb 2026 15:06:22 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH mm-unstable v2 4/5] mm/khugepaged: rename hpage_collapse_* to collapse_* To: Nico Pache , linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: aarcange@redhat.com, akpm@linux-foundation.org, anshuman.khandual@arm.com, apopple@nvidia.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, byungchul@sk.com, catalin.marinas@arm.com, cl@gentwo.org, corbet@lwn.net, dave.hansen@linux.intel.com, david@kernel.org, gourry@gourry.net, hannes@cmpxchg.org, hughd@google.com, jackmanb@google.com, jack@suse.cz, jannh@google.com, jglisse@google.com, joshua.hahnjy@gmail.com, kas@kernel.org, lance.yang@linux.dev, Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, mathieu.desnoyers@efficios.com, matthew.brost@intel.com, mhiramat@kernel.org, mhocko@suse.com, peterx@redhat.com, pfalcato@suse.de, rakie.kim@sk.com, raquini@redhat.com, rdunlap@infradead.org, richard.weiyang@gmail.com, rientjes@google.com, rostedt@goodmis.org, rppt@kernel.org, ryan.roberts@arm.com, shivankg@amd.com, sunnanyong@huawei.com, surenb@google.com, thomas.hellstrom@linux.intel.com, tiwai@suse.de, usamaarif642@gmail.com, vbabka@suse.cz, vishal.moola@gmail.com, wangkefeng.wang@huawei.com, will@kernel.org, willy@infradead.org, yang@os.amperecomputing.com, ying.huang@linux.alibaba.com, ziy@nvidia.com, zokeefe@google.com References: <20260226012929.169479-1-npache@redhat.com> <20260226012929.169479-5-npache@redhat.com> Content-Language: en-US From: Dev Jain In-Reply-To: <20260226012929.169479-5-npache@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 26/02/26 6:59 am, Nico Pache wrote: > The hpage_collapse functions describe functions used by madvise_collapse > and khugepaged. remove the unnecessary hpage prefix to shorten the > function name. > > Reviewed-by: Wei Yang > Reviewed-by: Lance Yang > Reviewed-by: Liam R. Howlett > Reviewed-by: Zi Yan > Reviewed-by: Baolin Wang > Reviewed-by: Lorenzo Stoakes > Acked-by: David Hildenbrand (Arm) > Signed-off-by: Nico Pache > --- Reviewed-by: Dev Jain > mm/khugepaged.c | 71 +++++++++++++++++++++++-------------------------- > mm/mremap.c | 2 +- > 2 files changed, 35 insertions(+), 38 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 4615f34911d1..64086488ca01 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -392,14 +392,14 @@ void __init khugepaged_destroy(void) > kmem_cache_destroy(mm_slot_cache); > } > > -static inline int hpage_collapse_test_exit(struct mm_struct *mm) > +static inline int collapse_test_exit(struct mm_struct *mm) > { > return atomic_read(&mm->mm_users) == 0; > } > > -static inline int hpage_collapse_test_exit_or_disable(struct mm_struct *mm) > +static inline int collapse_test_exit_or_disable(struct mm_struct *mm) > { > - return hpage_collapse_test_exit(mm) || > + return collapse_test_exit(mm) || > mm_flags_test(MMF_DISABLE_THP_COMPLETELY, mm); > } > > @@ -433,7 +433,7 @@ void __khugepaged_enter(struct mm_struct *mm) > int wakeup; > > /* __khugepaged_exit() must not run from under us */ > - VM_BUG_ON_MM(hpage_collapse_test_exit(mm), mm); > + VM_BUG_ON_MM(collapse_test_exit(mm), mm); > if (unlikely(mm_flags_test_and_set(MMF_VM_HUGEPAGE, mm))) > return; > > @@ -487,7 +487,7 @@ void __khugepaged_exit(struct mm_struct *mm) > } else if (slot) { > /* > * This is required to serialize against > - * hpage_collapse_test_exit() (which is guaranteed to run > + * collapse_test_exit() (which is guaranteed to run > * under mmap sem read mode). Stop here (after we return all > * pagetables will be destroyed) until khugepaged has finished > * working on the pagetables under the mmap_lock. > @@ -582,7 +582,7 @@ static enum scan_result __collapse_huge_page_isolate(struct vm_area_struct *vma, > goto out; > } > > - /* See hpage_collapse_scan_pmd(). */ > + /* See collapse_scan_pmd(). */ > if (folio_maybe_mapped_shared(folio)) { > ++shared; > if (cc->is_khugepaged && > @@ -833,7 +833,7 @@ static struct collapse_control khugepaged_collapse_control = { > .is_khugepaged = true, > }; > > -static bool hpage_collapse_scan_abort(int nid, struct collapse_control *cc) > +static bool collapse_scan_abort(int nid, struct collapse_control *cc) > { > int i; > > @@ -868,7 +868,7 @@ static inline gfp_t alloc_hugepage_khugepaged_gfpmask(void) > } > > #ifdef CONFIG_NUMA > -static int hpage_collapse_find_target_node(struct collapse_control *cc) > +static int collapse_find_target_node(struct collapse_control *cc) > { > int nid, target_node = 0, max_value = 0; > > @@ -887,7 +887,7 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) > return target_node; > } > #else > -static int hpage_collapse_find_target_node(struct collapse_control *cc) > +static int collapse_find_target_node(struct collapse_control *cc) > { > return 0; > } > @@ -906,7 +906,7 @@ static enum scan_result hugepage_vma_revalidate(struct mm_struct *mm, unsigned l > enum tva_type type = cc->is_khugepaged ? TVA_KHUGEPAGED : > TVA_FORCED_COLLAPSE; > > - if (unlikely(hpage_collapse_test_exit_or_disable(mm))) > + if (unlikely(collapse_test_exit_or_disable(mm))) > return SCAN_ANY_PROCESS; > > *vmap = vma = find_vma(mm, address); > @@ -977,7 +977,7 @@ static enum scan_result check_pmd_still_valid(struct mm_struct *mm, > > /* > * Bring missing pages in from swap, to complete THP collapse. > - * Only done if hpage_collapse_scan_pmd believes it is worthwhile. > + * Only done if khugepaged_scan_pmd believes it is worthwhile. > * > * Called and returns without pte mapped or spinlocks held. > * Returns result: if not SCAN_SUCCEED, mmap_lock has been released. > @@ -1063,7 +1063,7 @@ static enum scan_result alloc_charge_folio(struct folio **foliop, struct mm_stru > { > gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() : > GFP_TRANSHUGE); > - int node = hpage_collapse_find_target_node(cc); > + int node = collapse_find_target_node(cc); > struct folio *folio; > > folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, &cc->alloc_nmask); > @@ -1241,10 +1241,9 @@ static enum scan_result collapse_huge_page(struct mm_struct *mm, unsigned long a > return result; > } > > -static enum scan_result hpage_collapse_scan_pmd(struct mm_struct *mm, > - struct vm_area_struct *vma, unsigned long start_addr, > - bool *mmap_locked, unsigned int *cur_progress, > - struct collapse_control *cc) > +static enum scan_result collapse_scan_pmd(struct mm_struct *mm, > + struct vm_area_struct *vma, unsigned long start_addr, bool *mmap_locked, > + unsigned int *cur_progress, struct collapse_control *cc) > { > pmd_t *pmd; > pte_t *pte, *_pte; > @@ -1366,7 +1365,7 @@ static enum scan_result hpage_collapse_scan_pmd(struct mm_struct *mm, > * hit record. > */ > node = folio_nid(folio); > - if (hpage_collapse_scan_abort(node, cc)) { > + if (collapse_scan_abort(node, cc)) { > result = SCAN_SCAN_ABORT; > goto out_unmap; > } > @@ -1432,7 +1431,7 @@ static void collect_mm_slot(struct mm_slot *slot) > > lockdep_assert_held(&khugepaged_mm_lock); > > - if (hpage_collapse_test_exit(mm)) { > + if (collapse_test_exit(mm)) { > /* free mm_slot */ > hash_del(&slot->hash); > list_del(&slot->mm_node); > @@ -1787,7 +1786,7 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff) > if (find_pmd_or_thp_or_none(mm, addr, &pmd) != SCAN_SUCCEED) > continue; > > - if (hpage_collapse_test_exit(mm)) > + if (collapse_test_exit(mm)) > continue; > > if (!file_backed_vma_is_retractable(vma)) > @@ -2305,9 +2304,9 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr, > return result; > } > > -static enum scan_result hpage_collapse_scan_file(struct mm_struct *mm, > - unsigned long addr, struct file *file, pgoff_t start, > - unsigned int *cur_progress, struct collapse_control *cc) > +static enum scan_result collapse_scan_file(struct mm_struct *mm, unsigned long addr, > + struct file *file, pgoff_t start, unsigned int *cur_progress, > + struct collapse_control *cc) > { > struct folio *folio = NULL; > struct address_space *mapping = file->f_mapping; > @@ -2362,7 +2361,7 @@ static enum scan_result hpage_collapse_scan_file(struct mm_struct *mm, > } > > node = folio_nid(folio); > - if (hpage_collapse_scan_abort(node, cc)) { > + if (collapse_scan_abort(node, cc)) { > result = SCAN_SCAN_ABORT; > folio_put(folio); > break; > @@ -2418,7 +2417,7 @@ static enum scan_result hpage_collapse_scan_file(struct mm_struct *mm, > return result; > } > > -static unsigned int khugepaged_scan_mm_slot(unsigned int pages, enum scan_result *result, > +static unsigned int collapse_scan_mm_slot(unsigned int pages, enum scan_result *result, > struct collapse_control *cc) > __releases(&khugepaged_mm_lock) > __acquires(&khugepaged_mm_lock) > @@ -2453,7 +2452,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, enum scan_result > goto breakouterloop_mmap_lock; > > progress++; > - if (unlikely(hpage_collapse_test_exit_or_disable(mm))) > + if (unlikely(collapse_test_exit_or_disable(mm))) > goto breakouterloop; > > vma_iter_init(&vmi, mm, khugepaged_scan.address); > @@ -2461,7 +2460,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, enum scan_result > unsigned long hstart, hend; > > cond_resched(); > - if (unlikely(hpage_collapse_test_exit_or_disable(mm))) { > + if (unlikely(collapse_test_exit_or_disable(mm))) { > progress++; > break; > } > @@ -2484,7 +2483,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, enum scan_result > unsigned int cur_progress = 0; > > cond_resched(); > - if (unlikely(hpage_collapse_test_exit_or_disable(mm))) > + if (unlikely(collapse_test_exit_or_disable(mm))) > goto breakouterloop; > > VM_BUG_ON(khugepaged_scan.address < hstart || > @@ -2497,13 +2496,13 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, enum scan_result > > mmap_read_unlock(mm); > mmap_locked = false; > - *result = hpage_collapse_scan_file(mm, > + *result = collapse_scan_file(mm, > khugepaged_scan.address, file, pgoff, > &cur_progress, cc); > fput(file); > if (*result == SCAN_PTE_MAPPED_HUGEPAGE) { > mmap_read_lock(mm); > - if (hpage_collapse_test_exit_or_disable(mm)) > + if (collapse_test_exit_or_disable(mm)) > goto breakouterloop; > *result = try_collapse_pte_mapped_thp(mm, > khugepaged_scan.address, false); > @@ -2512,7 +2511,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, enum scan_result > mmap_read_unlock(mm); > } > } else { > - *result = hpage_collapse_scan_pmd(mm, vma, > + *result = collapse_scan_pmd(mm, vma, > khugepaged_scan.address, &mmap_locked, > &cur_progress, cc); > } > @@ -2546,7 +2545,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, enum scan_result > * Release the current mm_slot if this mm is about to die, or > * if we scanned all vmas of this mm, or THP got disabled. > */ > - if (hpage_collapse_test_exit_or_disable(mm) || !vma) { > + if (collapse_test_exit_or_disable(mm) || !vma) { > /* > * Make sure that if mm_users is reaching zero while > * khugepaged runs here, khugepaged_exit will find > @@ -2599,8 +2598,8 @@ static void khugepaged_do_scan(struct collapse_control *cc) > pass_through_head++; > if (khugepaged_has_work() && > pass_through_head < 2) > - progress += khugepaged_scan_mm_slot(pages - progress, > - &result, cc); > + progress += collapse_scan_mm_slot(pages - progress, > + &result, cc); > else > progress = pages; > spin_unlock(&khugepaged_mm_lock); > @@ -2844,8 +2843,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsigned long start, > mmap_read_unlock(mm); > mmap_locked = false; > *lock_dropped = true; > - result = hpage_collapse_scan_file(mm, addr, file, pgoff, > - NULL, cc); > + result = collapse_scan_file(mm, addr, file, pgoff, NULL, cc); > > if (result == SCAN_PAGE_DIRTY_OR_WRITEBACK && !triggered_wb && > mapping_can_writeback(file->f_mapping)) { > @@ -2859,8 +2857,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsigned long start, > } > fput(file); > } else { > - result = hpage_collapse_scan_pmd(mm, vma, addr, > - &mmap_locked, NULL, cc); > + result = collapse_scan_pmd(mm, vma, addr, &mmap_locked, NULL, cc); > } > if (!mmap_locked) > *lock_dropped = true; > diff --git a/mm/mremap.c b/mm/mremap.c > index 2be876a70cc0..eb222af91c2d 100644 > --- a/mm/mremap.c > +++ b/mm/mremap.c > @@ -244,7 +244,7 @@ static int move_ptes(struct pagetable_move_control *pmc, > goto out; > } > /* > - * Now new_pte is none, so hpage_collapse_scan_file() path can not find > + * Now new_pte is none, so collapse_scan_file() path can not find > * this by traversing file->f_mapping, so there is no concurrency with > * retract_page_tables(). In addition, we already hold the exclusive > * mmap_lock, so this new_pte page is stable, so there is no need to get