Commit cf503cc6 authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton
Browse files

mm: memory: use folio_prealloc() in wp_page_copy() 

Use folio_prealloc() helper to simplify code a bit.

Link: https://lkml.kernel.org/r/20231118023232.1409103-6-wangkefeng.wang@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e4621e70

mm/memory.c

+7 −15
Original line number Diff line number Diff line
@@ -3117,6 +3117,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) 
	int page_copied = 0;

	struct mmu_notifier_range range;

	vm_fault_t ret;

	bool pfn_is_zero;



	delayacct_wpcopy_start();
@@ -3126,16 +3127,13 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) 
	if (unlikely(ret))

		goto out;



	if (is_zero_pfn(pte_pfn(vmf->orig_pte))) {

		new_folio = vma_alloc_zeroed_movable_folio(vma, vmf->address);

	pfn_is_zero = is_zero_pfn(pte_pfn(vmf->orig_pte));

	new_folio = folio_prealloc(mm, vma, vmf->address, pfn_is_zero);

	if (!new_folio)

		goto oom;

	} else {



	if (!pfn_is_zero) {

		int err;

		new_folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma,

				vmf->address, false);

		if (!new_folio)

			goto oom;



		err = __wp_page_copy_user(&new_folio->page, vmf->page, vmf);

		if (err) {
@@ -3156,10 +3154,6 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) 
		kmsan_copy_page_meta(&new_folio->page, vmf->page);

	}



	if (mem_cgroup_charge(new_folio, mm, GFP_KERNEL))

		goto oom_free_new;

	folio_throttle_swaprate(new_folio, GFP_KERNEL);



	__folio_mark_uptodate(new_folio);



	mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, mm,
@@ -3258,8 +3252,6 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) 


	delayacct_wpcopy_end();

	return 0;

oom_free_new:

	folio_put(new_folio);

oom:

	ret = VM_FAULT_OOM;

out: