Commit 5631505d authored by Kefeng Wang's avatar Kefeng Wang
Browse files

mm: use pfn_swap_entry_folio() in copy_nonpresent_pte() 

mainline inclusion
from mainline-v6.9-rc1
commit 530c2a0da0b440bec4af3dae5bd7110f77962e9b
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CHB4
CVE: NA

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

Call pfn_swap_entry_folio() as preparation for converting mm counter
functions to take a folio.

Link: https://lkml.kernel.org/r/20240111152429.3374566-8-willy@infradead.org


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 530c2a0da0b440bec4af3dae5bd7110f77962e9b)
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
parent 67786313

mm/memory.c

+2 −2
Original line number Diff line number Diff line
@@ -811,9 +811,9 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, 
		}

		rss[MM_SWAPENTS]++;

	} else if (is_migration_entry(entry)) {

		page = pfn_swap_entry_to_page(entry);

		folio = pfn_swap_entry_folio(entry);



		rss[mm_counter(page)]++;

		rss[mm_counter(&folio->page)]++;



		if (!is_readable_migration_entry(entry) &&

				is_cow_mapping(vm_flags)) {