mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-30 10:00:03 -04:00
mm: cleanup clear_not_present_full_ptes() and rename to clear_non_present_ptes()
Let's clean it up a bit:
(1) There is no need to pass "full" anymore.
(2) No architecture overwrites it, and there isn't really a good reason
to do so when dealing with non-present PTEs.
(3) While at it, call it "non-present", similar to copy_nonpresent_pte()
and zap_nonpresent_ptes().
It's a shame that we have clear_non_present_ptes() correspond to
pte_clear() and clear_ptes() correspond to ptep_get_and_clear*().
Link: https://lore.kernel.org/20260629-clear_not_present_full_ptes-v2-3-96089871a1e7@kernel.org
Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>
Reviewed-by: Oscar Salvador (SUSE) <osalvador@kernel.org>
Reviewed-by: Lance Yang <lance.yang@linux.dev>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jann Horn <jannh@google.com>
Cc: Liam R. Howlett <liam@infradead.org>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
committed by
Andrew Morton
parent
ef68364cd7
commit
d045e8a05d
@@ -988,24 +988,19 @@ static inline void update_mmu_tlb(struct vm_area_struct *vma,
|
||||
update_mmu_tlb_range(vma, address, ptep, 1);
|
||||
}
|
||||
|
||||
#ifndef clear_not_present_full_ptes
|
||||
/**
|
||||
* clear_not_present_full_ptes - Clear multiple not present PTEs which are
|
||||
* consecutive in the pgtable.
|
||||
* clear_nonpresent_ptes - Clear multiple non-present PTEs which are
|
||||
* consecutive in the pgtable.
|
||||
* @mm: Address space the ptes represent.
|
||||
* @addr: Address of the first pte.
|
||||
* @ptep: Page table pointer for the first entry.
|
||||
* @nr: Number of entries to clear.
|
||||
* @full: Whether we are clearing a full mm.
|
||||
*
|
||||
* May be overridden by the architecture; otherwise, implemented as a simple
|
||||
* loop over pte_clear().
|
||||
*
|
||||
* Context: The caller holds the page table lock. The PTEs are all not present.
|
||||
* The PTEs are all in the same PMD.
|
||||
*/
|
||||
static inline void clear_not_present_full_ptes(struct mm_struct *mm,
|
||||
unsigned long addr, pte_t *ptep, unsigned int nr, int full)
|
||||
static inline void clear_nonpresent_ptes(struct mm_struct *mm,
|
||||
unsigned long addr, pte_t *ptep, unsigned int nr)
|
||||
{
|
||||
(void)addr;
|
||||
|
||||
@@ -1017,7 +1012,6 @@ static inline void clear_not_present_full_ptes(struct mm_struct *mm,
|
||||
addr += PAGE_SIZE;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef __HAVE_ARCH_PTEP_CLEAR_FLUSH
|
||||
extern pte_t ptep_clear_flush(struct vm_area_struct *vma,
|
||||
|
||||
@@ -694,7 +694,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr,
|
||||
nr = swap_pte_batch(pte, max_nr, ptent);
|
||||
nr_swap -= nr;
|
||||
swap_put_entries_direct(entry, nr);
|
||||
clear_not_present_full_ptes(mm, addr, pte, nr, tlb->fullmm);
|
||||
clear_nonpresent_ptes(mm, addr, pte, nr);
|
||||
} else if (softleaf_is_hwpoison(entry) ||
|
||||
softleaf_is_poison_marker(entry)) {
|
||||
pte_clear(mm, addr, pte);
|
||||
|
||||
@@ -1797,7 +1797,7 @@ static inline int zap_nonpresent_ptes(struct mmu_gather *tlb,
|
||||
pr_alert("unrecognized swap entry 0x%lx\n", entry.val);
|
||||
WARN_ON_ONCE(1);
|
||||
}
|
||||
clear_not_present_full_ptes(vma->vm_mm, addr, pte, nr, tlb->fullmm);
|
||||
clear_nonpresent_ptes(vma->vm_mm, addr, pte, nr);
|
||||
*any_skipped = zap_install_uffd_wp_if_needed(vma, addr, pte, nr, details, ptent);
|
||||
|
||||
return nr;
|
||||
|
||||
Reference in New Issue
Block a user