The quilt patch titled
Subject: mm/memory: convert do_shared_fault() to folios
has been removed from the -mm tree. Its filename was
mm-memory-convert-do_shared_fault-to-folios.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Sidhartha Kumar <sidhartha.kumar@xxxxxxxxxx>
Subject: mm/memory: convert do_shared_fault() to folios
Date: Sun, 2 Jul 2023 22:58:49 -0700
Saves three implicit calls to compound_head().
Link: https://lkml.kernel.org/r/20230703055850.227169-3-sidhartha.kumar@xxxxxxxxxx
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@xxxxxxxxxx>
Reviewed-by: ZhangPeng <zhangpeng362@xxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- a/mm/memory.c~mm-memory-convert-do_shared_fault-to-folios
+++ a/mm/memory.c
@@ -4605,6 +4605,7 @@ static vm_fault_t do_shared_fault(struct
{
struct vm_area_struct *vma = vmf->vma;
vm_fault_t ret, tmp;
+ struct folio *folio = page_folio(vmf->page);
ret = __do_fault(vmf);
if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
@@ -4615,11 +4616,11 @@ static vm_fault_t do_shared_fault(struct
* about to become writable
*/
if (vma->vm_ops->page_mkwrite) {
- unlock_page(vmf->page);
+ folio_unlock(folio);
tmp = do_page_mkwrite(vmf);
if (unlikely(!tmp ||
(tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) {
- put_page(vmf->page);
+ folio_put(folio);
return tmp;
}
}
@@ -4627,8 +4628,8 @@ static vm_fault_t do_shared_fault(struct
ret |= finish_fault(vmf);
if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE |
VM_FAULT_RETRY))) {
- unlock_page(vmf->page);
- put_page(vmf->page);
+ folio_unlock(folio);
+ folio_put(folio);
return ret;
}
_
Patches currently in -mm which might be from sidhartha.kumar@xxxxxxxxxx are
mm-increase-usage-of-folio_next_index-helper.patch
mm-memory-convert-do_read_fault-to-use-folios.patch
