Commit 41f28dae authored by Kefeng Wang's avatar Kefeng Wang Committed by Peng Zhang
Browse files

mm: use folio_xchg_last_cpupid() in wp_page_reuse() 

mainline inclusion
from mainline-v6.7-rc1
commit c2c3b5148052cef670d359b81d338d20b96bf47f
category: other
bugzilla: https://gitee.com/openeuler/kernel/issues/I8JQWQ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c2c3b5148052cef670d359b81d338d20b96bf47f

--------------------------------

Convert to use folio_xchg_last_cpupid() in wp_page_reuse(), and remove
page variable. Since now only normal and PMD-mapped page is handled by
numa balancing, it's enough to only update the entire folio's last cpupid.

Link: https://lkml.kernel.org/r/20231018140806.2783514-19-wangkefeng.wang@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 148fb2c9

mm/memory.c

+10 −9
Original line number Diff line number Diff line
@@ -3020,19 +3020,20 @@ static inline void wp_page_reuse(struct vm_fault *vmf, struct folio *folio) 
	__releases(vmf->ptl)

{

	struct vm_area_struct *vma = vmf->vma;

	struct page *page = vmf->page;

	pte_t entry;



	VM_BUG_ON(!(vmf->flags & FAULT_FLAG_WRITE));

	VM_BUG_ON(folio && folio_test_anon(folio) && !PageAnonExclusive(page));



	if (folio) {

		VM_BUG_ON(folio_test_anon(folio) &&

			  !PageAnonExclusive(vmf->page));

		/*

	 * Clear the pages cpupid information as the existing

		 * Clear the folio's cpupid information as the existing

		 * information potentially belongs to a now completely

		 * unrelated process.

		 */

	if (page)

		page_cpupid_xchg_last(page, (1 << LAST_CPUPID_SHIFT) - 1);

		folio_xchg_last_cpupid(folio, (1 << LAST_CPUPID_SHIFT) - 1);

	}



	flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte));

	entry = pte_mkyoung(vmf->orig_pte);