sparc: use is_huge_zero_pmd()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Tue, 26 Mar 2024 20:28:21 +0000 (20:28 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 26 Apr 2024 03:56:18 +0000 (20:56 -0700)
Patch series "Convert huge_zero_page to huge_zero_folio".

Almost all the callers of is_huge_zero_page() already have a folio.  And
they should -- is_huge_zero_page() will return false for tail pages, even
if they're tail pages of the huge zero page.  That's confusing, and one of
the benefits of the folio conversion is to get rid of this confusion.

This patch (of 8):

There's no need to convert to a page, much less a folio.  We can tell from
the pmd whether it is a huge zero page or not.  Saves 60 bytes of text.

Link: https://lkml.kernel.org/r/20240326202833.523759-1-willy@infradead.org
Link: https://lkml.kernel.org/r/20240326202833.523759-2-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
arch/sparc/mm/tlb.c

index b44d79d778c718164e45813be89e3089ebf24efc..19642f7ffb52a5f02421a946e8b19a0cbcd3bba1 100644 (file)
@@ -183,12 +183,12 @@ static void __set_pmd_acct(struct mm_struct *mm, unsigned long addr,
                 * hugetlb_pte_count.
                 */
                if (pmd_val(pmd) & _PAGE_PMD_HUGE) {
-                       if (is_huge_zero_page(pmd_page(pmd)))
+                       if (is_huge_zero_pmd(pmd))
                                mm->context.hugetlb_pte_count++;
                        else
                                mm->context.thp_pte_count++;
                } else {
-                       if (is_huge_zero_page(pmd_page(orig)))
+                       if (is_huge_zero_pmd(orig))
                                mm->context.hugetlb_pte_count--;
                        else
                                mm->context.thp_pte_count--;
@@ -259,7 +259,7 @@ pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
         * Sanity check pmd before doing the actual decrement.
         */
        if ((pmd_val(entry) & _PAGE_PMD_HUGE) &&
-           !is_huge_zero_page(pmd_page(entry)))
+           !is_huge_zero_pmd(entry))
                (vma->vm_mm)->context.thp_pte_count--;
 
        return old;