mm/huge_memory: remove useless folio pointers passing

Since the previous commit "mm/huge_memory: Adjust try_to_migrate_one() and
split_huge_pmd_locked()" has simplified the logic by leveraging the folio
verification in page_vma_mapped_walk(), this patch removes the unnecessary
folio pointers passing.

Link: https://lkml.kernel.org/r/20250425103859.825879-3-gavinguo@igalia.com
Link: https://lore.kernel.org/all/98d1d195-7821-4627-b518-83103ade56c0@redhat.com/
Link: https://lore.kernel.org/all/91599a3c-e69e-4d79-bac5-5013c96203d7@redhat.com/
Signed-off-by: Gavin Guo <gavinguo@igalia.com>
Suggested-by: David Hildenbrand <david@redhat.com>
Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Florent Revest <revest@google.com>
Cc: Gavin Shan <gshan@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index f190998b2ebd052d5a9c37567d36f192ceceffdd..2f190c90192d0186007b6ffbd555e939d7e43912 100644 (file)
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -395,7 +395,7 @@ static inline int split_huge_page(struct page *page)
 void deferred_split_folio(struct folio *folio, bool partially_mapped);
 
 void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
-               unsigned long address, bool freeze, struct folio *folio);
+               unsigned long address, bool freeze);
 
 #define split_huge_pmd(__vma, __pmd, __address)                                \
        do {                                                            \
@@ -403,12 +403,11 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
                if (is_swap_pmd(*____pmd) || pmd_trans_huge(*____pmd)   \
                                        || pmd_devmap(*____pmd))        \
                        __split_huge_pmd(__vma, __pmd, __address,       \
-                                               false, NULL);           \
+                                        false);                        \
        }  while (0)
 
-
 void split_huge_pmd_address(struct vm_area_struct *vma, unsigned long address,
-               bool freeze, struct folio *folio);
+               bool freeze);
 
 void __split_huge_pud(struct vm_area_struct *vma, pud_t *pud,
                unsigned long address);
@@ -501,7 +500,7 @@ static inline bool thp_migration_supported(void)
 }
 
 void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address,
-                          pmd_t *pmd, bool freeze, struct folio *folio);
+                          pmd_t *pmd, bool freeze);
 bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr,
                           pmd_t *pmdp, struct folio *folio);
 
@@ -576,12 +575,12 @@ static inline void deferred_split_folio(struct folio *folio, bool partially_mapp
        do { } while (0)
 
 static inline void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
-               unsigned long address, bool freeze, struct folio *folio) {}
+               unsigned long address, bool freeze) {}
 static inline void split_huge_pmd_address(struct vm_area_struct *vma,
-               unsigned long address, bool freeze, struct folio *folio) {}
+               unsigned long address, bool freeze) {}
 static inline void split_huge_pmd_locked(struct vm_area_struct *vma,
                                         unsigned long address, pmd_t *pmd,
-                                        bool freeze, struct folio *folio) {}
+                                        bool freeze) {}
 
 static inline bool unmap_huge_pmd_locked(struct vm_area_struct *vma,
                                         unsigned long addr, pmd_t *pmdp,

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index d8a5bb602008294d18552d6b609cb7367f474c7c..2780a12b25f01d5a0acc0790db3c5c7f607a55ab 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1785,7 +1785,7 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,
                pte_free(dst_mm, pgtable);
                spin_unlock(src_ptl);
                spin_unlock(dst_ptl);
-               __split_huge_pmd(src_vma, src_pmd, addr, false, NULL);
+               __split_huge_pmd(src_vma, src_pmd, addr, false);
                return -EAGAIN;
        }
        add_mm_counter(dst_mm, MM_ANONPAGES, HPAGE_PMD_NR);
@@ -2007,7 +2007,7 @@ unlock_fallback:
        folio_unlock(folio);
        spin_unlock(vmf->ptl);
 fallback:
-       __split_huge_pmd(vma, vmf->pmd, vmf->address, false, NULL);
+       __split_huge_pmd(vma, vmf->pmd, vmf->address, false);
        return VM_FAULT_FALLBACK;
 }
 
@@ -3080,7 +3080,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
 }
 
 void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address,
-                          pmd_t *pmd, bool freeze, struct folio *folio)
+                          pmd_t *pmd, bool freeze)
 {
        VM_WARN_ON_ONCE(!IS_ALIGNED(address, HPAGE_PMD_SIZE));
        if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) ||
@@ -3089,7 +3089,7 @@ void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address,
 }
 
 void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
-               unsigned long address, bool freeze, struct folio *folio)
+               unsigned long address, bool freeze)
 {
        spinlock_t *ptl;
        struct mmu_notifier_range range;
@@ -3099,20 +3099,20 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
                                (address & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE);
        mmu_notifier_invalidate_range_start(&range);
        ptl = pmd_lock(vma->vm_mm, pmd);
-       split_huge_pmd_locked(vma, range.start, pmd, freeze, folio);
+       split_huge_pmd_locked(vma, range.start, pmd, freeze);
        spin_unlock(ptl);
        mmu_notifier_invalidate_range_end(&range);
 }
 
 void split_huge_pmd_address(struct vm_area_struct *vma, unsigned long address,
-               bool freeze, struct folio *folio)
+               bool freeze)
 {
        pmd_t *pmd = mm_find_pmd(vma->vm_mm, address);
 
        if (!pmd)
                return;
 
-       __split_huge_pmd(vma, pmd, address, freeze, folio);
+       __split_huge_pmd(vma, pmd, address, freeze);
 }
 
 static inline void split_huge_pmd_if_needed(struct vm_area_struct *vma, unsigned long address)
@@ -3124,7 +3124,7 @@ static inline void split_huge_pmd_if_needed(struct vm_area_struct *vma, unsigned
        if (!IS_ALIGNED(address, HPAGE_PMD_SIZE) &&
            range_in_vma(vma, ALIGN_DOWN(address, HPAGE_PMD_SIZE),
                         ALIGN(address, HPAGE_PMD_SIZE)))
-               split_huge_pmd_address(vma, address, false, NULL);
+               split_huge_pmd_address(vma, address, false);
 }
 
 void vma_adjust_trans_huge(struct vm_area_struct *vma,

diff --git a/mm/memory.c b/mm/memory.c
index f18266b5a0a934db16a9efa0121de824fac44b63..be124dadec9e2593eb2416ff7f091586a15327d2 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1808,7 +1808,7 @@ static inline unsigned long zap_pmd_range(struct mmu_gather *tlb,
                next = pmd_addr_end(addr, end);
                if (is_swap_pmd(*pmd) || pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
                        if (next - addr != HPAGE_PMD_SIZE)
-                               __split_huge_pmd(vma, pmd, addr, false, NULL);
+                               __split_huge_pmd(vma, pmd, addr, false);
                        else if (zap_huge_pmd(tlb, vma, pmd, addr)) {
                                addr = next;
                                continue;
@@ -5932,7 +5932,7 @@ static inline vm_fault_t wp_huge_pmd(struct vm_fault *vmf)
 
 split:
        /* COW or write-notify handled on pte level: split pmd. */
-       __split_huge_pmd(vma, vmf->pmd, vmf->address, false, NULL);
+       __split_huge_pmd(vma, vmf->pmd, vmf->address, false);
 
        return VM_FAULT_FALLBACK;
 }

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 62c1f79457412032254b4ee38160addf91723dc5..88608d0dc2c2ec8a83db8cfb36afa4650ace354f 100644 (file)
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -379,7 +379,7 @@ again:
                if (is_swap_pmd(_pmd) || pmd_trans_huge(_pmd) || pmd_devmap(_pmd)) {
                        if ((next - addr != HPAGE_PMD_SIZE) ||
                            pgtable_split_needed(vma, cp_flags)) {
-                               __split_huge_pmd(vma, pmd, addr, false, NULL);
+                               __split_huge_pmd(vma, pmd, addr, false);
                                /*
                                 * For file-backed, the pmd could have been
                                 * cleared; make sure pmd populated if

diff --git a/mm/rmap.c b/mm/rmap.c
index b53a4dcaeaaef8c4e5c78b3baf691b6ce28aabf2..4992005885eff67242ad8fd08264bb5b90dcc50c 100644 (file)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1944,7 +1944,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma,
                                 * restart so we can process the PTE-mapped THP.
                                 */
                                split_huge_pmd_locked(vma, pvmw.address,
-                                                     pvmw.pmd, false, folio);
+                                                     pvmw.pmd, false);
                                flags &= ~TTU_SPLIT_HUGE_PMD;
                                page_vma_mapped_walk_restart(&pvmw);
                                continue;
@@ -2320,7 +2320,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma,
                if (!pvmw.pte) {
                        if (flags & TTU_SPLIT_HUGE_PMD) {
                                split_huge_pmd_locked(vma, pvmw.address,
-                                                     pvmw.pmd, true, NULL);
+                                                     pvmw.pmd, true);
                                ret = false;
                                page_vma_mapped_walk_done(&pvmw);
                                break;