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

!14031 Various memory tiering fixes 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tong Tiangen <tongtiangen@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2I7QJN6E43FFO4O3UKKKZSIIQYIKSFQI/ 
Zi Yan (3):
  memory tiering: read last_cpupid correctly in do_huge_pmd_numa_page()
  memory tiering: introduce folio_use_access_time() check
  memory tiering: count PGPROMOTE_SUCCESS when mem tiering is enabled.


-- 
2.25.1
 
https://gitee.com/openeuler/kernel/issues/IB8EOE 
 
Link:https://gitee.com/openeuler/kernel/pulls/14031

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents d72146e8 3c305ec1

include/linux/mm.h

+6 −0
Original line number Diff line number Diff line
@@ -1774,6 +1774,8 @@ static inline void vma_set_access_pid_bit(struct vm_area_struct *vma) 
		__set_bit(pid_bit, &vma->numab_state->access_pids[1]);

	}

}



bool folio_use_access_time(struct folio *folio);

#else /* !CONFIG_NUMA_BALANCING */

static inline int folio_xchg_last_cpupid(struct folio *folio, int cpupid)

{
@@ -1827,6 +1829,10 @@ static inline bool cpupid_match_pid(struct task_struct *task, int cpupid) 
static inline void vma_set_access_pid_bit(struct vm_area_struct *vma)

{

}

static inline bool folio_use_access_time(struct folio *folio)

{

	return false;

}

#endif /* CONFIG_NUMA_BALANCING */



#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS)

kernel/sched/fair.c

+1 −2
Original line number Diff line number Diff line
@@ -1999,8 +1999,7 @@ bool should_numa_migrate_memory(struct task_struct *p, struct folio *folio, 
	 * The pages in slow memory node should be migrated according

	 * to hot/cold instead of private/shared.

	 */

	if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING &&

	    !node_is_toptier(src_nid)) {

	if (folio_use_access_time(folio)) {

		struct pglist_data *pgdat;

		unsigned long rate_limit;

		unsigned int latency, th, def_th;

mm/huge_memory.c

+2 −3
Original line number Diff line number Diff line
@@ -2033,7 +2033,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) 
	 * For memory tiering mode, cpupid of slow memory page is used

	 * to record page access time.  So use default value.

	 */

	if (node_is_toptier(nid))

	if (!folio_use_access_time(folio))

		last_cpupid = folio_last_cpupid(folio);

	target_nid = numa_migrate_prep(folio, vma, haddr, nid, &flags);

	if (target_nid == NUMA_NO_NODE) {
@@ -2383,8 +2383,7 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, 
		    toptier)

			goto unlock;



		if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING &&

		    !toptier)

		if (folio_use_access_time(folio))

			folio_xchg_access_time(folio,

					       jiffies_to_msecs(jiffies));

	}

mm/memory-tiers.c

+19 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/memory.h>

#include <linux/memory-tiers.h>

#include <linux/notifier.h>

#include <linux/sched/sysctl.h>



#include "internal.h"
@@ -44,6 +45,24 @@ static struct bus_type memory_tier_subsys = { 
	.dev_name = "memory_tier",

};



#ifdef CONFIG_NUMA_BALANCING

/**

 * folio_use_access_time - check if a folio reuses cpupid for page access time

 * @folio: folio to check

 *

 * folio's _last_cpupid field is repurposed by memory tiering. In memory

 * tiering mode, cpupid of slow memory folio (not toptier memory) is used to

 * record page access time.

 *

 * Return: the folio _last_cpupid is used to record page access time

 */

bool folio_use_access_time(struct folio *folio)

{

	return (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) &&

	       !node_is_toptier(folio_nid(folio));

}

#endif



#ifdef CONFIG_MIGRATION

static int top_tier_adistance;

/*

mm/memory.c

+1 −2
Original line number Diff line number Diff line
@@ -5328,8 +5328,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) 
	 * For memory tiering mode, cpupid of slow memory page is used

	 * to record page access time.  So use default value.

	 */

	if ((sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) &&

	    !node_is_toptier(nid))

	if (folio_use_access_time(folio))

		last_cpupid = (-1 & LAST_CPUPID_MASK);

	else

		last_cpupid = folio_last_cpupid(folio);