mm-change-folio_lock_or_retry-to-use-vm_fault-directly.patch removed from -mm tree
The quilt patch titled
Subject: mm: change folio_lock_or_retry to use vm_fault directly
has been removed from the -mm tree. Its filename was
mm-change-folio_lock_or_retry-to-use-vm_fault-directly.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Suren Baghdasaryan <[email protected]>
Subject: mm: change folio_lock_or_retry to use vm_fault directly
Date: Fri, 30 Jun 2023 14:19:55 -0700
Change folio_lock_or_retry to accept vm_fault struct and return the vm_fault_t directly.
Signed-off-by Suren Baghdasaryan <[email protected]>
Suggested-by Matthew Wilcox <[email protected]>
Acked-by Peter Xu <[email protected]>
Cc Alistair Popple <[email protected]>
Cc Al Viro <[email protected]>
Cc Christian Brauner <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc David Howells <[email protected]>
Cc Davidlohr Bueso <[email protected]>
Cc Hillf Danton <[email protected]>
Cc "Huang, Ying" <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Jan Kara <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Josef Bacik <[email protected]>
Cc Laurent Dufour <[email protected]>
Cc Liam R. Howlett <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Michel Lespinasse <[email protected]>
Cc Minchan Kim <[email protected]>
Cc Pavel Tatashin <[email protected]>
Cc Punit Agrawal <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Yu Zhao <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/pagemap.h | 11 ++++++----- mm/filemap.c | 22 ++++++++++++---------- mm/memory.c | 14 ++++++-------- 3 files changed, 24 insertions(+), 23 deletions(-)
include/linux/pagemap.h renamed from include/linux/pagemap.h~mm-change-folio_lock_or_retry-to-use-vm_fault-directly +6 -5
@@ -916,8 +916,7 @@ static inline bool wake_page_match(strucvoid __folio_lock (struct folio *folio);int __folio_lock_killable (struct folio *folio); -bool __folio_lock_or_retry (struct folio *folio,struct mm_struct *mm, -unsigned int flags); +vm_fault_t __folio_lock_or_retry (struct folio *folio,struct vm_fault *vmf);void unlock_page (struct page *page);void folio_unlock (struct folio *folio);
@@ -1021,11 +1020,13 @@ static inline int folio_lock_killable(st* Return value and mmap_lock implications depend on flags; see * __folio_lock_or_retry(). */ -static inline bool folio_lock_or_retry (struct folio *folio, -struct mm_struct *mm,unsigned int flags) +static inline vm_fault_t folio_lock_or_retry (struct folio *folio, +struct vm_fault *vmf) {might_sleep (); -return folio_trylock (folio) ||__folio_lock_or_retry (folio, mm, flags); +if (!folio_trylock (folio)) +return __folio_lock_or_retry (folio, vmf); +return 0 ; }/*
mm/filemap.c renamed from mm/filemap.c~mm-change-folio_lock_or_retry-to-use-vm_fault-directly +12 -10
@@ -1669,32 +1669,34 @@ static int __folio_lock_async(struct fol/* * Return values: -* true - folio is locked; mmap_lock is still held. -* false - folio is not locked. +* 0 - folio is locked. +* non-zero - folio is not locked. * mmap_lock has been released (mmap_read_unlock(), unless flags had both * FAULT_FLAG_ALLOW_RETRY and FAULT_FLAG_RETRY_NOWAIT set, in * which case mmap_lock is still held. * -* If neither ALLOW_RETRY nor KILLABLE are set, will always return true +* If neither ALLOW_RETRY nor KILLABLE are set, will always return 0 * with the folio locked and the mmap_lock unperturbed. */ -bool __folio_lock_or_retry (struct folio *folio,struct mm_struct *mm, -unsigned int flags) +vm_fault_t __folio_lock_or_retry (struct folio *folio,struct vm_fault *vmf) { +struct mm_struct *mm = vmf->vma->vm_mm; +unsigned int flags = vmf->flags; +if (fault_flag_allow_retry_first (flags)) {/* * CAUTION! In this case, mmap_lock is not released -* even though return 0. +* even though return VM_FAULT_RETRY. */ if (flags &FAULT_FLAG_RETRY_NOWAIT ) -return false; +return VM_FAULT_RETRY ;mmap_read_unlock (mm);if (flags &FAULT_FLAG_KILLABLE )folio_wait_locked_killable (folio);else folio_wait_locked (folio); -return false; +return VM_FAULT_RETRY ; }if (flags &FAULT_FLAG_KILLABLE ) {bool ret;
@@ -1702,13 +1704,13 @@ bool __folio_lock_or_retry(struct folio ret =__folio_lock_killable (folio);if (ret) {mmap_read_unlock (mm); -return false; +return VM_FAULT_RETRY ; } }else {__folio_lock (folio); } -return true; +return 0 ; }/**
mm/memory.c renamed from mm/memory.c~mm-change-folio_lock_or_retry-to-use-vm_fault-directly +6 -8
@@ -3599,6 +3599,7 @@ static vm_fault_t remove_device_exclusivstruct folio *folio =page_folio (vmf->page);struct vm_area_struct *vma = vmf->vma;struct mmu_notifier_range range; +vm_fault_t ret;/* * We need a reference to lock the folio because we don't hold
@@ -3611,9 +3612,10 @@ static vm_fault_t remove_device_exclusivif (!folio_try_get (folio))return 0 ; -if (!folio_lock_or_retry (folio, vma->vm_mm, vmf->flags)) { + ret =folio_lock_or_retry (folio, vmf); +if (ret) {folio_put (folio); -return VM_FAULT_RETRY ; +return ret; } mmu_notifier_range_init_owner(&range, MMU_NOTIFY_EXCLUSIVE, 0, vma->vm_mm, vmf->address & PAGE_MASK,
@@ -3738,7 +3740,6 @@ vm_fault_t do_swap_page(struct vm_faultbool exclusive = false;swp_entry_t entry;pte_t pte; -int locked;vm_fault_t ret =0 ;void *shadow =NULL ;
@@ -3861,12 +3862,9 @@ vm_fault_t do_swap_page(struct vm_fault goto out_release; } - locked =folio_lock_or_retry (folio, vma->vm_mm, vmf->flags); - -if (!locked) { - ret |=VM_FAULT_RETRY ; + ret |=folio_lock_or_retry (folio, vmf); +if (ret &VM_FAULT_RETRY ) goto out_release; - }if (swapcache) {/*
_
Patches currently in -mm which might be from [email protected] are