functions in khugepaged.c use a mix of hpage_collapse and khugepaged
as the function prefix.
rename all of them to khugepaged to keep things consistent and slightly
shorten the function names.
Reviewed-by: Zi Yan <ziy@nvidia.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: Nico Pache <npache@redhat.com>
---
mm/khugepaged.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 1aa7ca67c756..f27fe7ca9b86 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -402,14 +402,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 khugepaged_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 khugepaged_test_exit_or_disable(struct mm_struct *mm)
{
- return hpage_collapse_test_exit(mm) ||
+ return khugepaged_test_exit(mm) ||
test_bit(MMF_DISABLE_THP, &mm->flags);
}
@@ -444,7 +444,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(khugepaged_test_exit(mm), mm);
if (unlikely(test_and_set_bit(MMF_VM_HUGEPAGE, &mm->flags)))
return;
@@ -503,7 +503,7 @@ void __khugepaged_exit(struct mm_struct *mm)
} else if (mm_slot) {
/*
* This is required to serialize against
- * hpage_collapse_test_exit() (which is guaranteed to run
+ * khugepaged_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.
@@ -838,7 +838,7 @@ struct collapse_control khugepaged_collapse_control = {
.is_khugepaged = true,
};
-static bool hpage_collapse_scan_abort(int nid, struct collapse_control *cc)
+static bool khugepaged_scan_abort(int nid, struct collapse_control *cc)
{
int i;
@@ -873,7 +873,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 khugepaged_find_target_node(struct collapse_control *cc)
{
int nid, target_node = 0, max_value = 0;
@@ -892,7 +892,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 khugepaged_find_target_node(struct collapse_control *cc)
{
return 0;
}
@@ -912,7 +912,7 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address,
struct vm_area_struct *vma;
unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0;
- if (unlikely(hpage_collapse_test_exit_or_disable(mm)))
+ if (unlikely(khugepaged_test_exit_or_disable(mm)))
return SCAN_ANY_PROCESS;
*vmap = vma = find_vma(mm, address);
@@ -977,7 +977,7 @@ static int 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 int alloc_charge_folio(struct folio **foliop, struct mm_struct *mm,
{
gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() :
GFP_TRANSHUGE);
- int node = hpage_collapse_find_target_node(cc);
+ int node = khugepaged_find_target_node(cc);
struct folio *folio;
folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, &cc->alloc_nmask);
@@ -1249,7 +1249,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address,
return result;
}
-static int hpage_collapse_scan_pmd(struct mm_struct *mm,
+static int khugepaged_scan_pmd(struct mm_struct *mm,
struct vm_area_struct *vma,
unsigned long address, bool *mmap_locked,
struct collapse_control *cc)
@@ -1363,7 +1363,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm,
* hit record.
*/
node = folio_nid(folio);
- if (hpage_collapse_scan_abort(node, cc)) {
+ if (khugepaged_scan_abort(node, cc)) {
result = SCAN_SCAN_ABORT;
goto out_unmap;
}
@@ -1432,7 +1432,7 @@ static void collect_mm_slot(struct khugepaged_mm_slot *mm_slot)
lockdep_assert_held(&khugepaged_mm_lock);
- if (hpage_collapse_test_exit(mm)) {
+ if (khugepaged_test_exit(mm)) {
/* free mm_slot */
hash_del(&slot->hash);
list_del(&slot->mm_node);
@@ -1725,7 +1725,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 (khugepaged_test_exit(mm))
continue;
/*
* When a vma is registered with uffd-wp, we cannot recycle
@@ -2247,7 +2247,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
return result;
}
-static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr,
+static int khugepaged_scan_file(struct mm_struct *mm, unsigned long addr,
struct file *file, pgoff_t start,
struct collapse_control *cc)
{
@@ -2304,7 +2304,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr,
}
node = folio_nid(folio);
- if (hpage_collapse_scan_abort(node, cc)) {
+ if (khugepaged_scan_abort(node, cc)) {
result = SCAN_SCAN_ABORT;
folio_put(folio);
break;
@@ -2392,7 +2392,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result,
goto breakouterloop_mmap_lock;
progress++;
- if (unlikely(hpage_collapse_test_exit_or_disable(mm)))
+ if (unlikely(khugepaged_test_exit_or_disable(mm)))
goto breakouterloop;
vma_iter_init(&vmi, mm, khugepaged_scan.address);
@@ -2400,7 +2400,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result,
unsigned long hstart, hend;
cond_resched();
- if (unlikely(hpage_collapse_test_exit_or_disable(mm))) {
+ if (unlikely(khugepaged_test_exit_or_disable(mm))) {
progress++;
break;
}
@@ -2422,7 +2422,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result,
bool mmap_locked = true;
cond_resched();
- if (unlikely(hpage_collapse_test_exit_or_disable(mm)))
+ if (unlikely(khugepaged_test_exit_or_disable(mm)))
goto breakouterloop;
VM_BUG_ON(khugepaged_scan.address < hstart ||
@@ -2482,7 +2482,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result,
* Release the current mm_slot if this mm is about to die, or
* if we scanned all vmas of this mm.
*/
- if (hpage_collapse_test_exit(mm) || !vma) {
+ if (khugepaged_test_exit(mm) || !vma) {
/*
* Make sure that if mm_users is reaching zero while
* khugepaged runs here, khugepaged_exit will find
--
2.49.0On 02/07/25 11:27 am, Nico Pache wrote: > functions in khugepaged.c use a mix of hpage_collapse and khugepaged > as the function prefix. > > rename all of them to khugepaged to keep things consistent and slightly > shorten the function names. > > Reviewed-by: Zi Yan <ziy@nvidia.com> > Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> > Signed-off-by: Nico Pache <npache@redhat.com> > --- > You are essentially reverting commit 7d8faaf15545 which adds the hpage_collapse_ prefix. Since in the next patch you also unify madvise and khugepaged, removing hpage_collapse prefix would make sense, but then I tend to agree with Liam that dropping the prefix altogether is better. Having all the functions in khugepaged.c prefixed with khugepaged_ seems unnecessary work. @David, I forgot where you replied but I remember you saying that we should not introduce MADV_COLLAPSE mTHP support for now?
On 04.07.25 07:14, Dev Jain wrote: > > On 02/07/25 11:27 am, Nico Pache wrote: >> functions in khugepaged.c use a mix of hpage_collapse and khugepaged >> as the function prefix. >> >> rename all of them to khugepaged to keep things consistent and slightly >> shorten the function names. >> >> Reviewed-by: Zi Yan <ziy@nvidia.com> >> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> >> Signed-off-by: Nico Pache <npache@redhat.com> >> --- >> > > You are essentially reverting commit 7d8faaf15545 which adds the > hpage_collapse_ prefix. Since in the next patch you also unify > madvise and khugepaged, removing hpage_collapse prefix would > make sense, but then I tend to agree with Liam that dropping > the prefix altogether is better. Having all the functions in > khugepaged.c prefixed with khugepaged_ seems unnecessary work. Yeah. Or just "collapse_". Anything is better than this "hpage" stuff. > > @David, I forgot where you replied but I remember you saying > that we should not introduce MADV_COLLAPSE mTHP support for > now? Yes, that's what Lorenzo and me discussed. Better to keep it at PMDs for now, as that's what the current interface promises. In theory, we could do something like the following without causing too much trouble: Collapse to the largest THP spanned by the range. I.e., when collapsing a 2M aligned range, only use a 2M THP. when collapsing a 64K aligned range, only use a 64K THP. etc. Because that would keep existing behavior mostly unchanged. But I would defer all that for now ... -- Cheers, David / dhildenb
On Tue, Jul 08, 2025 at 05:57:31PM +0200, David Hildenbrand wrote: > Yeah. Or just "collapse_". Anything is better than this "hpage" stuff. > > > > > @David, I forgot where you replied but I remember you saying > > that we should not introduce MADV_COLLAPSE mTHP support for > > now? > > Yes, that's what Lorenzo and me discussed. Better to keep it at PMDs for > now, as that's what the current interface promises. Reminds me, I will reply to that thread to make this clear. I'll also review this series, at some point... :)))
On Thu, Jul 3, 2025 at 11:14 PM Dev Jain <dev.jain@arm.com> wrote: > > > On 02/07/25 11:27 am, Nico Pache wrote: > > functions in khugepaged.c use a mix of hpage_collapse and khugepaged > > as the function prefix. > > > > rename all of them to khugepaged to keep things consistent and slightly > > shorten the function names. > > > > Reviewed-by: Zi Yan <ziy@nvidia.com> > > Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> > > Signed-off-by: Nico Pache <npache@redhat.com> > > --- > > > > You are essentially reverting commit 7d8faaf15545 which adds the > hpage_collapse_ prefix. Since in the next patch you also unify > madvise and khugepaged, removing hpage_collapse prefix would > make sense, but then I tend to agree with Liam that dropping > the prefix altogether is better. Having all the functions in > khugepaged.c prefixed with khugepaged_ seems unnecessary work. Ah thanks for pointing that out, I didn't realize they were already once named khugepaged. Makes sense, since there is opposition, and a good reason to have them as hpage_collapse (or collapse) I'll consider either dropping this patch, or changing it to "collapse_". tbh I didn't realize that was what Liam was suggesting, I thought he was suggesting dropping the hpage_collapse entirely. > > @David, I forgot where you replied but I remember you saying > that we should not introduce MADV_COLLAPSE mTHP support for > now? Yeah Baolin pointed me to that thread (https://lore.kernel.org/all/23b8ad10-cd1f-45df-a25c-78d01c8af44f@redhat.com/) I read most of that discussion as it was happening but missed that point. I'll add the small change I need to drop the MADV_COLLAPSE support and send a V9 in a few days (to gather more review). Adding MADV_COLLAPSE support should be easy once/if we come to a consensus on what the proper approach is. Thanks, -- Nico >
© 2016 - 2025 Red Hat, Inc.