Commit ef713ec3 authored by Peter Xu's avatar Peter Xu Committed by Andrew Morton

mm: drop is_huge_zero_pud()

It constantly returns false since 2017.  One assertion is added in 2019 but
it should never have triggered, IOW it means what is checked should be
asserted instead.

If it didn't exist for 7 years maybe it's good idea to remove it and only
add it when it comes.

Link: https://lkml.kernel.org/r/20240826204353.2228736-3-peterx@redhat.comSigned-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Gavin Shan <gshan@redhat.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Niklas Schnelle <schnelle@linux.ibm.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 6857be5f
...@@ -433,11 +433,6 @@ static inline bool is_huge_zero_pmd(pmd_t pmd) ...@@ -433,11 +433,6 @@ static inline bool is_huge_zero_pmd(pmd_t pmd)
return pmd_present(pmd) && READ_ONCE(huge_zero_pfn) == pmd_pfn(pmd); return pmd_present(pmd) && READ_ONCE(huge_zero_pfn) == pmd_pfn(pmd);
} }
static inline bool is_huge_zero_pud(pud_t pud)
{
return false;
}
struct folio *mm_get_huge_zero_folio(struct mm_struct *mm); struct folio *mm_get_huge_zero_folio(struct mm_struct *mm);
void mm_put_huge_zero_folio(struct mm_struct *mm); void mm_put_huge_zero_folio(struct mm_struct *mm);
...@@ -578,11 +573,6 @@ static inline bool is_huge_zero_pmd(pmd_t pmd) ...@@ -578,11 +573,6 @@ static inline bool is_huge_zero_pmd(pmd_t pmd)
return false; return false;
} }
static inline bool is_huge_zero_pud(pud_t pud)
{
return false;
}
static inline void mm_put_huge_zero_folio(struct mm_struct *mm) static inline void mm_put_huge_zero_folio(struct mm_struct *mm)
{ {
return; return;
......
...@@ -1453,10 +1453,8 @@ static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr, ...@@ -1453,10 +1453,8 @@ static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr,
ptl = pud_lock(mm, pud); ptl = pud_lock(mm, pud);
if (!pud_none(*pud)) { if (!pud_none(*pud)) {
if (write) { if (write) {
if (pud_pfn(*pud) != pfn_t_to_pfn(pfn)) { if (WARN_ON_ONCE(pud_pfn(*pud) != pfn_t_to_pfn(pfn)))
WARN_ON_ONCE(!is_huge_zero_pud(*pud));
goto out_unlock; goto out_unlock;
}
entry = pud_mkyoung(*pud); entry = pud_mkyoung(*pud);
entry = maybe_pud_mkwrite(pud_mkdirty(entry), vma); entry = maybe_pud_mkwrite(pud_mkdirty(entry), vma);
if (pudp_set_access_flags(vma, addr, pud, entry, 1)) if (pudp_set_access_flags(vma, addr, pud, entry, 1))
...@@ -1704,15 +1702,6 @@ int copy_huge_pud(struct mm_struct *dst_mm, struct mm_struct *src_mm, ...@@ -1704,15 +1702,6 @@ int copy_huge_pud(struct mm_struct *dst_mm, struct mm_struct *src_mm,
if (unlikely(!pud_trans_huge(pud) && !pud_devmap(pud))) if (unlikely(!pud_trans_huge(pud) && !pud_devmap(pud)))
goto out_unlock; goto out_unlock;
/*
* When page table lock is held, the huge zero pud should not be
* under splitting since we don't split the page itself, only pud to
* a page table.
*/
if (is_huge_zero_pud(pud)) {
/* No huge zero pud yet */
}
/* /*
* TODO: once we support anonymous pages, use * TODO: once we support anonymous pages, use
* folio_try_dup_anon_rmap_*() and split if duplicating fails. * folio_try_dup_anon_rmap_*() and split if duplicating fails.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment