Commit 6f609b7e authored by Sidhartha Kumar's avatar Sidhartha Kumar Committed by Andrew Morton
Browse files

mm/memory: convert do_shared_fault() to folios 

Saves three implicit calls to compound_head().

Link: https://lkml.kernel.org/r/20230706163847.403202-3-sidhartha.kumar@oracle.com


Signed-off-by: default avatarSidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarZhangPeng <zhangpeng362@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5a97858b

mm/memory.c

+7 −4
Original line number Diff line number Diff line
@@ -4602,21 +4602,24 @@ static vm_fault_t do_shared_fault(struct vm_fault *vmf) 
{

	struct vm_area_struct *vma = vmf->vma;

	vm_fault_t ret, tmp;

	struct folio *folio;



	ret = __do_fault(vmf);

	if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))

		return ret;



	folio = page_folio(vmf->page);



	/*

	 * Check if the backing address space wants to know that the page is

	 * 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;

		}

	}
@@ -4624,8 +4627,8 @@ static vm_fault_t do_shared_fault(struct vm_fault *vmf) 
	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;

	}