Unverified Commit cf08b37e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15580 two bugfixs 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tong Tiangen <tongtiangen@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/BUVMQF7GDZGJQGL4VFYUKLFQJ62TGQJ3/ 
Brian Geffon (1):
  mm: fix finish_fault() handling for large folios

Zi Yan (1):
  mm/migrate: fix shmem xarray update during migration

 
https://gitee.com/openeuler/kernel/issues/IBNJCQ
https://gitee.com/src-openeuler/kernel/issues/IBRQ5C 
 
Link:https://gitee.com/openeuler/kernel/pulls/15580

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 010e974a 58f0cc85

mm/memory.c

+10 −5
Original line number Diff line number Diff line
@@ -4846,7 +4846,11 @@ vm_fault_t finish_fault(struct vm_fault *vmf) 
	bool is_cow = (vmf->flags & FAULT_FLAG_WRITE) &&

		      !(vma->vm_flags & VM_SHARED);

	int type, nr_pages;

	unsigned long addr = vmf->address;

	unsigned long addr;

	bool needs_fallback = false;



fallback:

	addr = vmf->address;



	/* Did we COW the page? */

	if (is_cow)
@@ -4885,7 +4889,8 @@ vm_fault_t finish_fault(struct vm_fault *vmf) 
	 * approach also applies to non-anonymous-shmem faults to avoid

	 * inflating the RSS of the process.

	 */

	if (!vma_is_anon_shmem(vma) || unlikely(userfaultfd_armed(vma))) {

	if (!vma_is_anon_shmem(vma) || unlikely(userfaultfd_armed(vma)) ||

	    unlikely(needs_fallback)) {

		nr_pages = 1;

	} else if (nr_pages > 1) {

		pgoff_t idx = folio_page_idx(folio, page);
@@ -4921,9 +4926,9 @@ vm_fault_t finish_fault(struct vm_fault *vmf) 
		ret = VM_FAULT_NOPAGE;

		goto unlock;

	} else if (nr_pages > 1 && !pte_range_none(vmf->pte, nr_pages)) {

		update_mmu_tlb_range(vma, addr, vmf->pte, nr_pages);

		ret = VM_FAULT_NOPAGE;

		goto unlock;

		needs_fallback = true;

		pte_unmap_unlock(vmf->pte, vmf->ptl);

		goto fallback;

	}



	folio_ref_add(folio, nr_pages - 1);

mm/migrate.c

+4 −6
Original line number Diff line number Diff line
@@ -449,15 +449,13 @@ static int __folio_migrate_mapping(struct address_space *mapping, 
	if (folio_test_anon(folio) && folio_test_large(folio))

		mod_mthp_stat(folio_order(folio), MTHP_STAT_NR_ANON, 1);

	folio_ref_add(newfolio, nr); /* add cache reference */

	if (folio_test_swapbacked(folio)) {

	if (folio_test_swapbacked(folio))

		__folio_set_swapbacked(newfolio);

	if (folio_test_swapcache(folio)) {

		folio_set_swapcache(newfolio);

		newfolio->private = folio_get_private(folio);

		}

		entries = nr;

	} else {

		VM_BUG_ON_FOLIO(folio_test_swapcache(folio), folio);

		entries = 1;

	}