This is prepare for a separate filemap_set_pte_range(), add a prepare_range_pte_entry(), no functional changes. Signed-off-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx> --- include/linux/mm.h | 2 ++ mm/memory.c | 33 ++++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 9849dfda44d4..bcbeb8a4cd43 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1372,6 +1372,8 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma) } vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page); +pte_t prepare_range_pte_entry(struct vm_fault *vmf, bool write, struct folio *folio, + struct page *page, unsigned int nr, unsigned long addr); void set_pte_range(struct vm_fault *vmf, struct folio *folio, struct page *page, unsigned int nr, unsigned long addr); diff --git a/mm/memory.c b/mm/memory.c index 6647685fd3c4..ccbeb58fa136 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4652,19 +4652,11 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) } #endif -/** - * set_pte_range - Set a range of PTEs to point to pages in a folio. - * @vmf: Fault decription. - * @folio: The folio that contains @page. - * @page: The first page to create a PTE for. - * @nr: The number of PTEs to create. - * @addr: The first address to create a PTE for. - */ -void set_pte_range(struct vm_fault *vmf, struct folio *folio, - struct page *page, unsigned int nr, unsigned long addr) +pte_t prepare_range_pte_entry(struct vm_fault *vmf, bool write, + struct folio *folio, struct page *page, + unsigned int nr, unsigned long addr) { struct vm_area_struct *vma = vmf->vma; - bool write = vmf->flags & FAULT_FLAG_WRITE; bool prefault = in_range(vmf->address, addr, nr * PAGE_SIZE); pte_t entry; @@ -4680,6 +4672,25 @@ void set_pte_range(struct vm_fault *vmf, struct folio *folio, entry = maybe_mkwrite(pte_mkdirty(entry), vma); if (unlikely(vmf_orig_pte_uffd_wp(vmf))) entry = pte_mkuffd_wp(entry); + + return entry; +} + +/** + * set_pte_range - Set a range of PTEs to point to pages in a folio. + * @vmf: Fault description. + * @folio: The folio that contains @page. + * @page: The first page to create a PTE for. + * @nr: The number of PTEs to create. + * @addr: The first address to create a PTE for. + */ +void set_pte_range(struct vm_fault *vmf, struct folio *folio, + struct page *page, unsigned int nr, unsigned long addr) +{ + struct vm_area_struct *vma = vmf->vma; + bool write = vmf->flags & FAULT_FLAG_WRITE; + pte_t entry = prepare_range_pte_entry(vmf, write, folio, page, nr, addr); + /* copy-on-write page */ if (write && !(vma->vm_flags & VM_SHARED)) { VM_BUG_ON_FOLIO(nr != 1, folio); -- 2.27.0