Commit 5e9bf0de authored by Kefeng Wang's avatar Kefeng Wang Committed by Peng Zhang
Browse files

mm: migrate: use folio_xchg_last_cpupid() in folio_migrate_flags() 

mainline inclusion
from mainline-v6.7-rc1
commit 4e694fe4d2fa3031392bdbeaa88066f67c886a0c
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=4e694fe4d2fa3031392bdbeaa88066f67c886a0c

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

Convert to use folio_xchg_last_cpupid() in folio_migrate_flags(), also
directly use folio_nid() instead of page_to_nid(&folio->page).

Link: https://lkml.kernel.org/r/20231018140806.2783514-15-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 06863d87

mm/migrate.c

+4 −4
Original line number Diff line number Diff line
@@ -588,20 +588,20 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio) 
	 * Copy NUMA information to the new page, to prevent over-eager

	 * future migrations of this same page.

	 */

	cpupid = page_cpupid_xchg_last(&folio->page, -1);

	cpupid = folio_xchg_last_cpupid(folio, -1);

	/*

	 * For memory tiering mode, when migrate between slow and fast

	 * memory node, reset cpupid, because that is used to record

	 * page access time in slow memory node.

	 */

	if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) {

		bool f_toptier = node_is_toptier(page_to_nid(&folio->page));

		bool t_toptier = node_is_toptier(page_to_nid(&newfolio->page));

		bool f_toptier = node_is_toptier(folio_nid(folio));

		bool t_toptier = node_is_toptier(folio_nid(newfolio));



		if (f_toptier != t_toptier)

			cpupid = -1;

	}

	page_cpupid_xchg_last(&newfolio->page, cpupid);

	folio_xchg_last_cpupid(newfolio, cpupid);



	folio_migrate_ksm(newfolio, folio);

	/*