NUMA balancing: optimize memory placement for memory tiering system
Subsystems (10)
cover NUMA balancing: optimize memory placement for memory tiering system
The changes since the last post are as follows,
- Rebased on v5.16-rc1
- Revise error processing for [1/6] (promotion counter) per Yang's comments
- Add sysctl document for [2/6] (optimize page placement)
- Reset threshold adjustment state when disable/enable tiering mode
- Reset threshold when workload transition is detected.
--
With the advent of various new memory types, some machines will have multiple types of memory, e.g. DRAM and PMEM (persistent memory). The memory subsystem of these machines can be called memory tiering system, because the performance of the different types of memory are different.
After commit c221c0b0308f ("device-dax: "Hotplug" persistent memory for use like normal RAM"), the PMEM could be used as the cost-effective volatile memory in separate NUMA nodes. In a typical memory tiering system, there are CPUs, DRAM and PMEM in each physical NUMA node. The CPUs and the DRAM will be put in one logical node, while the PMEM will be put in another (faked) logical node.
To optimize the system overall performance, the hot pages should be placed in DRAM node. To do that, we need to identify the hot pages in the PMEM node and migrate them to DRAM node via NUMA migration.
In the original NUMA balancing, there are already a set of existing mechanisms to identify the pages recently accessed by the CPUs in a node and migrate the pages to the node. So we can reuse these mechanisms to build the mechanisms to optimize the page placement in the memory tiering system. This is implemented in this patchset.
At the other hand, the cold pages should be placed in PMEM node. So, we also need to identify the cold pages in the DRAM node and migrate them to PMEM node.
In commit 26aa2d199d6f ("mm/migrate: demote pages during reclaim"), a mechanism to demote the cold DRAM pages to PMEM node under memory pressure is implemented. Based on that, the cold DRAM pages can be demoted to PMEM node proactively to free some memory space on DRAM node to accommodate the promoted hot PMEM pages. This is implemented in this patchset too.
We have tested the solution with the pmbench memory accessing benchmark with the 80:20 read/write ratio and the normal access address distribution on a 2 socket Intel server with Optane DC Persistent Memory Model. The test results of the base kernel and step by step optimizations are as follows,
Throughput Promotion DRAM bandwidth
access/s MB/s MB/s
----------- ---------- --------------
Base 69263986.8 1830.2
Patch 2 135691921.4 385.6 11315.9 Patch 3 133239016.8 384.7 11065.2 Patch 4 151310868.9 197.6 11397.0 Patch 5 142311252.8 99.3 9580.8 Patch 6 149044263.9 65.5 9922.8
The whole patchset improves the benchmark score up to 115.2%. The basic NUMA balancing based optimization solution (patch 2), the hot page selection algorithm (patch 4), and the threshold automatic adjustment algorithms (patch 6) improves the performance or reduce the overhead (promotion MB/s) greatly.
Changelog:
v10:
- Rebased on v5.16-rc1
- Revise error processing for [1/6] (promotion counter) per Yang's comments
- Add sysctl document for [2/6] (optimize page placement)
- Reset threshold adjustment state when disable/enable tiering mode
- Reset threshold when workload transition is detected.
v9:
- Rebased on v5.15-rc4
- Make "add promotion counter" the first patch per Yang's comments
v8:
- Rebased on v5.15-rc1
- Make user-specified threshold take effect sooner
v7:
- Rebased on the mmots tree of 2021-07-15.
- Some minor fixes.
v6:
- Rebased on the latest page demotion patchset. (which bases on v5.11)
v5:
- Rebased on the latest page demotion patchset. (which bases on v5.10)
v4:
- Rebased on the latest page demotion patchset. (which bases on v5.9-rc6)
- Add page promotion counter.
v3:
- Move the rate limit control as late as possible per Mel Gorman's comments.
- Revise the hot page selection implementation to store page scan time in struct page.
- Code cleanup.
- Rebased on the latest page demotion patchset.
v2:
- Addressed comments for V1.
- Rebased on v5.5.
Best Regards,
Huang, Ying
PATCH 1/6 NUMA Balancing: add page promotion counter
In a system with multiple memory types, e.g. DRAM and PMEM, the CPU and DRAM in one socket will be put in one NUMA node as before, while the PMEM will be put in another NUMA node as described in the description of the commit c221c0b0308f ("device-dax: "Hotplug" persistent memory for use like normal RAM"). So, the NUMA balancing mechanism will identify all PMEM accesses as remote access and try to promote the PMEM pages to DRAM.
To distinguish the number of the inter-type promoted pages from that of the inter-socket migrated pages. A new vmstat count is added. The counter is per-node (count in the target node). So this can be used to identify promotion imbalance among the NUMA nodes.
--- include/linux/mmzone.h | 3 +++ include/linux/node.h | 5 +++++ mm/migrate.c | 13 ++++++++++--- mm/vmstat.c | 3 +++ 4 files changed, 21 insertions(+), 3 deletions(-)
include/linux/mmzone.h +3 -0
@@ -210,6 +210,9 @@ enum node_stat_item { NR_PAGETABLE, /* used for pagetables */#ifdef CONFIG_SWAP NR_SWAPCACHE, +#endif +#ifdef CONFIG_NUMA_BALANCING +PGPROMOTE_SUCCESS ,/* promote successfully */ #endifNR_VM_NODE_STAT_ITEMS };
include/linux/node.h +5 -0
@@ -181,4 +181,9 @@ static inline void register_hugetlbfs_with_node(node_registration_func_t reg,#define to_node (device) container_of(device, struct node, dev) +static inline bool node_is_toptier (int node) +{ +return node_state (node,N_CPU ); +} +#endif /* _LINUX_NODE_H_ */
mm/migrate.c +10 -3
@@ -2141,6 +2141,7 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma,pg_data_t *pgdat =NODE_DATA (node);int isolated;int nr_remaining; +int nr_succeeded;LIST_HEAD (migratepages);new_page_t *new;bool compound;
@@ -2179,7 +2180,8 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma,list_add (&page->lru, &migratepages); nr_remaining =migrate_pages (&migratepages, *new,NULL , node, -MIGRATE_ASYNC ,MR_NUMA_MISPLACED ,NULL ); +MIGRATE_ASYNC ,MR_NUMA_MISPLACED , + &nr_succeeded);if (nr_remaining) {if (!list_empty (&migratepages)) {list_del (&page->lru);
@@ -2188,8 +2190,13 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma,putback_lru_page (page); } isolated =0 ; - }else -count_vm_numa_events (NUMA_PAGE_MIGRATE , nr_pages); + } +if (nr_succeeded) { +count_vm_numa_events (NUMA_PAGE_MIGRATE , nr_succeeded); +if (!node_is_toptier (page_to_nid (page)) &&node_is_toptier (node)) +mod_node_page_state (NODE_DATA (node),PGPROMOTE_SUCCESS , + nr_succeeded); + }BUG_ON (!list_empty (&migratepages));return isolated;
mm/vmstat.c +3 -0
@@ -1242,6 +1242,9 @@ const char * const vmstat_text[] = {#ifdef CONFIG_SWAP "nr_swapcached",#endif +#ifdef CONFIG_NUMA_BALANCING +"pgpromote_success" , +#endif/* enum writeback_stat_item counters */ "nr_dirty_threshold",
Signature · 1 line
2.30.2
Re: [PATCH -V10 1/6] NUMA Balancing: add page promotion counter
Quoted 9 lines · Huang Ying
In a system with multiple memory types, e.g. DRAM and PMEM, the CPU and DRAM in one socket will be put in one NUMA node as before, while the PMEM will be put in another NUMA node as described in the description of the commit
c221c0b0308f("device-dax: "Hotplug" persistent memory for use like normal RAM"). So, the NUMA balancing mechanism will identify all PMEM accesses as remote access and try to promote the PMEM pages to DRAM.
Quoted 4 lines
To distinguish the number of the inter-type promoted pages from that of the inter-socket migrated pages. A new vmstat count is added. The counter is per-node (count in the target node). So this can be used to identify promotion imbalance among the NUMA nodes.
Quoted 105 lines
Signed-off-by "Huang, Ying" <[email protected]>Cc Andrew Morton <[email protected]>Cc Michal Hocko <[email protected]>Cc Rik van Riel <[email protected]>Cc Mel Gorman <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Dave Hansen <[email protected]>Cc Yang Shi <[email protected]>Cc Zi Yan <[email protected]>Cc Wei Xu <[email protected]>Cc osalvador <[email protected]>Cc Shakeel Butt <[email protected]>--- include/linux/mmzone.h | 3 +++ include/linux/node.h | 5 +++++ mm/migrate.c | 13 ++++++++++--- mm/vmstat.c | 3 +++ 4 files changed, 21 insertions(+), 3 deletions(-)include/linux/mmzone.h +3
-0@@ -210,6 +210,9 @@ enum node_stat_item { NR_PAGETABLE, /* used for pagetables */#ifdef CONFIG_SWAP NR_SWAPCACHE, +#endif +#ifdef CONFIG_NUMA_BALANCING +PGPROMOTE_SUCCESS ,/* promote successfully */ #endifNR_VM_NODE_STAT_ITEMS };include/linux/node.h +5
-0@@ -181,4 +181,9 @@ static inline void register_hugetlbfs_with_node(node_registration_func_t reg,#define to_node (device) container_of(device, struct node, dev) +static inline bool node_is_toptier (int node) +{ +return node_state (node,N_CPU ); +} +#endif /* _LINUX_NODE_H_ */ mm/migrate.c +10
-3@@ -2141,6 +2141,7 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma,pg_data_t *pgdat =NODE_DATA (node);int isolated;int nr_remaining; +int nr_succeeded;LIST_HEAD (migratepages);new_page_t *new;bool compound;@@ -2179,7 +2180,8 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma,list_add (&page->lru, &migratepages); nr_remaining =migrate_pages (&migratepages, *new,NULL , node, -MIGRATE_ASYNC ,MR_NUMA_MISPLACED ,NULL ); +MIGRATE_ASYNC ,MR_NUMA_MISPLACED , + &nr_succeeded);if (nr_remaining) {if (!list_empty (&migratepages)) {list_del (&page->lru);@@ -2188,8 +2190,13 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma,putback_lru_page (page); } isolated =0 ; - }else -count_vm_numa_events (NUMA_PAGE_MIGRATE , nr_pages); + } +if (nr_succeeded) { +count_vm_numa_events (NUMA_PAGE_MIGRATE , nr_succeeded); +if (!node_is_toptier (page_to_nid (page)) &&node_is_toptier (node)) +mod_node_page_state (NODE_DATA (node),PGPROMOTE_SUCCESS , + nr_succeeded); + }BUG_ON (!list_empty (&migratepages));return isolated;mm/vmstat.c +3
-1@@ -1242,6 +1242,9 @@ const char * const vmstat_text[] = {#ifdef CONFIG_SWAP "nr_swapcached",#endif +#ifdef CONFIG_NUMA_BALANCING +"pgpromote_success" , +#endif/* enum writeback_stat_item counters */ "nr_dirty_threshold", --2.30.2
PATCH 2/6 NUMA balancing: optimize page placement for memory tiering system
In reply to Huang YingWith the advent of various new memory types, some machines will have multiple types of memory, e.g. DRAM and PMEM (persistent memory). The memory subsystem of these machines can be called memory tiering system, because the performance of the different types of memory are usually different.
In such system, because of the memory accessing pattern changing etc, some pages in the slow memory may become hot globally. So in this patch, the NUMA balancing mechanism is enhanced to optimize the page placement among the different memory types according to hot/cold dynamically.
In a typical memory tiering system, there are CPUs, fast memory and slow memory in each physical NUMA node. The CPUs and the fast memory will be put in one logical node (called fast memory node), while the slow memory will be put in another (faked) logical node (called slow memory node). That is, the fast memory is regarded as local while the slow memory is regarded as remote. So it's possible for the recently accessed pages in the slow memory node to be promoted to the fast memory node via the existing NUMA balancing mechanism.
The original NUMA balancing mechanism will stop to migrate pages if the free memory of the target node will become below the high watermark. This is a reasonable policy if there's only one memory type. But this makes the original NUMA balancing mechanism almost not work to optimize page placement among different memory types. Details are as follows.
It's the common cases that the working-set size of the workload is larger than the size of the fast memory nodes. Otherwise, it's unnecessary to use the slow memory at all. So in the common cases, there are almost always no enough free pages in the fast memory nodes, so that the globally hot pages in the slow memory node cannot be promoted to the fast memory node. To solve the issue, we have 2 choices as follows,
a. Ignore the free pages watermark checking when promoting hot pages
from the slow memory node to the fast memory node. This will create some memory pressure in the fast memory node, thus trigger the memory reclaiming. So that, the cold pages in the fast memory node will be demoted to the slow memory node.
b. Make kswapd of the fast memory node to reclaim pages until the free
pages are a little more (about 10MB) than the high watermark. Then, if the free pages of the fast memory node reaches high watermark, and some hot pages need to be promoted, kswapd of the fast memory node will be waken up to demote some cold pages in the fast memory node to the slow memory node. This will free some extra space in the fast memory node, so the hot pages in the slow memory node can be promoted to the fast memory node.
The choice "a" will create the memory pressure in the fast memory node. If the memory pressure of the workload is high, the memory pressure may become so high that the memory allocation latency of the workload is influenced, e.g. the direct reclaiming may be triggered.
The choice "b" works much better at this aspect. If the memory pressure of the workload is high, the hot pages promotion will stop earlier because its allocation watermark is higher than that of the normal memory allocation. So in this patch, choice "b" is implemented.
In addition to the original page placement optimization among sockets, the NUMA balancing mechanism is extended to be used to optimize page placement according to hot/cold among different memory types. So the sysctl user space interface (numa_balancing) is extended in a backward compatible way as follow, so that the users can enable/disable these functionality individually.
The sysctl is converted from a Boolean value to a bits field. The definition of the flags is,
- 0x0: NUMA_BALANCING_DISABLED
- 0x1: NUMA_BALANCING_NORMAL
- 0x2: NUMA_BALANCING_MEMORY_TIERING
--- Documentation/admin-guide/sysctl/kernel.rst | 29 ++++++++++++++------- include/linux/sched/sysctl.h | 10 +++++++ kernel/sched/core.c | 21 ++++++++++++--- kernel/sysctl.c | 3 ++- mm/migrate.c | 19 ++++++++++++-- mm/vmscan.c | 16 ++++++++++++ 6 files changed, 82 insertions(+), 16 deletions(-)
Documentation/admin-guide/sysctl/kernel.rst +20 -9
@@ -595,16 +595,23 @@ Documentation/admin-guide/kernel-parameters.rst). numa_balancing ============== -Enables/disables automatic page fault based NUMA memory -balancing. Memory is moved automatically to nodes -that access it often. +Enables/disables and configure automatic page fault based NUMA memory +balancing. Memory is moved automatically to nodes that access it +often. The value to set can be the result to OR the following, -Enables/disables automatic NUMA memory balancing. On NUMA machines, there -is a performance penalty if remote memory is accessed by a CPU. When this -feature is enabled the kernel samples what task thread is accessing memory -by periodically unmapping pages and later trapping a page fault. At the -time of the page fault, it is determined if the data being accessed should -be migrated to a local memory node. += ================================= +0x0 NUMA_BALANCING_DISABLED +0x1 NUMA_BALANCING_NORMAL +0x2 NUMA_BALANCING_MEMORY_TIERING += ================================= + +Or NUMA_BALANCING_NORMAL to optimize page placement among different +NUMA nodes to reduce remote accessing. On NUMA machines, there is a +performance penalty if remote memory is accessed by a CPU. When this +feature is enabled the kernel samples what task thread is accessing +memory by periodically unmapping pages and later trapping a page +fault. At the time of the page fault, it is determined if the data +being accessed should be migrated to a local memory node. The unmapping of pages and trapping faults incur additional overhead that ideally is offset by improved memory locality but there is no universal
@@ -615,6 +622,10 @@ faults may be controlled by the `numa_balancing_scan_period_min_ms, numa_balancing_scan_delay_ms, numa_balancing_scan_period_max_ms, numa_balancing_scan_size_mb`_, and numa_balancing_settle_count sysctls. +Or NUMA_BALANCING_MEMORY_TIERING to optimize page placement among +different types of memory (represented as different NUMA nodes) to +place the hot pages in the fast memory. This is implemented based on +unmapping and page fault too. numa_balancing_scan_period_min_ms, numa_balancing_scan_delay_ms, numa_balancing_scan_period_max_ms, numa_balancing_scan_size_mb ===============================================================================================================================
include/linux/sched/sysctl.h +10 -0
@@ -35,6 +35,16 @@ enum sched_tunable_scaling { SCHED_TUNABLESCALING_END, }; +#define NUMA_BALANCING_DISABLED 0x0 +#define NUMA_BALANCING_NORMAL 0x1 +#define NUMA_BALANCING_MEMORY_TIERING 0x2 + +#ifdef CONFIG_NUMA_BALANCING +extern int sysctl_numa_balancing_mode; +#else +#define sysctl_numa_balancing_mode 0 +#endif +/* * control realtime throttling: *
kernel/sched/core.c +17 -4
@@ -4265,7 +4265,9 @@ DEFINE_STATIC_KEY_FALSE(sched_numa_balancing);#ifdef CONFIG_NUMA_BALANCING -void set_numabalancing_state (bool enabled) +int sysctl_numa_balancing_mode; + +static void __set_numabalancing_state (bool enabled) {if (enabled)static_branch_enable (&sched_numa_balancing);
@@ -4273,13 +4275,22 @@ void set_numabalancing_state(bool enabled)static_branch_disable (&sched_numa_balancing); } +void set_numabalancing_state (bool enabled) +{ +if (enabled) + sysctl_numa_balancing_mode =NUMA_BALANCING_NORMAL ; +else + sysctl_numa_balancing_mode =NUMA_BALANCING_DISABLED ; +__set_numabalancing_state (enabled); +} +#ifdef CONFIG_PROC_SYSCTL int sysctl_numa_balancing (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table t;int err; -int state =static_branch_likely (&sched_numa_balancing); +int state = sysctl_numa_balancing_mode;if (write && !capable (CAP_SYS_ADMIN ))return -EPERM ;
@@ -4289,8 +4300,10 @@ int sysctl_numa_balancing(struct ctl_table *table, int write, err =proc_dointvec_minmax (&t, write, buffer, lenp, ppos);if (err <0 )return err; -if (write) -set_numabalancing_state (state); +if (write) { + sysctl_numa_balancing_mode = state; +__set_numabalancing_state (state); + } return err; }#endif
kernel/sysctl.c +2 -1
@@ -115,6 +115,7 @@ static int sixty = 60;static int __maybe_unused neg_one =-1 ;static int __maybe_unused two =2 ; +static int __maybe_unused three =3 ;static int __maybe_unused four =4 ;static unsigned long zero_ul;static unsigned long one_ul =1 ;
@@ -1808,7 +1809,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = sysctl_numa_balancing, .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, + .extra2 = &three, },#endif /* CONFIG_NUMA_BALANCING */ {
mm/migrate.c +17 -2
@@ -50,6 +50,7 @@#include <linux/ptrace.h> #include <linux/oom.h> #include <linux/memory.h> +#include <linux/sched/sysctl.h> #include <asm/tlbflush.h>
@@ -2103,16 +2104,30 @@ static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) {int page_lru;int nr_pages =thp_nr_pages (page); +int order =compound_order (page); -VM_BUG_ON_PAGE (compound_order (page) && !PageTransHuge (page), page); +VM_BUG_ON_PAGE (order && !PageTransHuge (page), page);/* Do not migrate THP mapped by multiple processes */ if (PageTransHuge (page) &&total_mapcount (page) >1 )return 0 ;/* Avoid migrating to a node that is nearly full */ -if (!migrate_balanced_pgdat (pgdat, nr_pages)) +if (!migrate_balanced_pgdat (pgdat, nr_pages)) { +int z; + +if (!(sysctl_numa_balancing_mode &NUMA_BALANCING_MEMORY_TIERING ) || + !numa_demotion_enabled) +return 0 ; +if (next_demotion_node (pgdat->node_id) ==NUMA_NO_NODE ) +return 0 ; +for (z = pgdat->nr_zones -1 ; z >=0 ; z--) { +if (populated_zone (pgdat->node_zones + z)) +break ; + } +wakeup_kswapd (pgdat->node_zones + z,0 , order,ZONE_MOVABLE );return 0 ; + }if (isolate_lru_page (page))return 0 ;
mm/vmscan.c +16 -0
@@ -56,6 +56,7 @@#include <linux/swapops.h> #include <linux/balloon_compaction.h> +#include <linux/sched/sysctl.h> #include "internal.h"
@@ -3908,6 +3909,12 @@ static bool pgdat_watermark_boosted(pg_data_t *pgdat, int highest_zoneidx)return false; } +/* +* Keep the free pages on fast memory node a little more than the high +* watermark to accommodate the promoted pages. +*/ +#define NUMA_BALANCING_PROMOTE_WATERMARK (10UL * 1024 * 1024 >> PAGE_SHIFT) +/* * Returns true if there is an eligible zone balanced for the request order * and highest_zoneidx
@@ -3929,6 +3936,15 @@ static bool pgdat_balanced(pg_data_t *pgdat, int order, int highest_zoneidx)continue ; mark =high_wmark_pages (zone); +if (sysctl_numa_balancing_mode &NUMA_BALANCING_MEMORY_TIERING && + numa_demotion_enabled && +next_demotion_node (pgdat->node_id) !=NUMA_NO_NODE ) { +unsigned long promote_mark; + + promote_mark =min (NUMA_BALANCING_PROMOTE_WATERMARK , + pgdat->node_present_pages >>6 ); + mark += promote_mark; + }if (zone_watermark_ok_safe (zone, order, mark, highest_zoneidx))return true; }
Signature · 1 line
2.30.2
Zi Yan
reviewerRe: [PATCH -V10 2/6] NUMA balancing: optimize page placement for memory tiering system
Quoted 41 lines · Huang Ying
With the advent of various new memory types, some machines will have multiple types of memory, e.g. DRAM and PMEM (persistent memory). The memory subsystem of these machines can be called memory tiering system, because the performance of the different types of memory are usually different.
In such system, because of the memory accessing pattern changing etc, some pages in the slow memory may become hot globally. So in this patch, the NUMA balancing mechanism is enhanced to optimize the page placement among the different memory types according to hot/cold dynamically.
In a typical memory tiering system, there are CPUs, fast memory and slow memory in each physical NUMA node. The CPUs and the fast memory will be put in one logical node (called fast memory node), while the slow memory will be put in another (faked) logical node (called slow memory node). That is, the fast memory is regarded as local while the slow memory is regarded as remote. So it's possible for the recently accessed pages in the slow memory node to be promoted to the fast memory node via the existing NUMA balancing mechanism.
The original NUMA balancing mechanism will stop to migrate pages if the free memory of the target node will become below the high watermark. This is a reasonable policy if there's only one memory type. But this makes the original NUMA balancing mechanism almost not work to optimize page placement among different memory types. Details are as follows.
It's the common cases that the working-set size of the workload is larger than the size of the fast memory nodes. Otherwise, it's unnecessary to use the slow memory at all. So in the common cases, there are almost always no enough free pages in the fast memory nodes, so that the globally hot pages in the slow memory node cannot be promoted to the fast memory node. To solve the issue, we have 2 choices as follows,
a. Ignore the free pages watermark checking when promoting hot pages
from the slow memory node to the fast memory node. This will create some memory pressure in the fast memory node, thus trigger the memory reclaiming. So that, the cold pages in the fast memory node will be demoted to the slow memory node.
Quoted 8 lines
b. Make kswapd of the fast memory node to reclaim pages until the free
pages are a little more (about 10MB) than the high watermark. Then, if the free pages of the fast memory node reaches high watermark, and some hot pages need to be promoted, kswapd of the fast memory node will be waken up to demote some cold pages in the fast memory node to the slow memory node. This will free some extra space in the fast memory node, so the hot pages in the slow memory node can be promoted to the fast memory node.
Why 10MB? Is 10MB big enough to avoid creating memory pressure on fast memory? This number seems pretty ad-hoc and may only work well on your test machine.
In theory, this extra free memory space should be related to page promotion throughput and kswapd demotion throughput, right? Patch 5 allows user to adjust page promotion throughput, NUMA_BALANCING_PROMOTE_WATERMARK at least can be something like X * numa_balancing_rate_limit_mbps. Also, is there any way of measuring kswapd demotion throughput at boot time? So we can take it into account too. Does this make sense?
Quoted 279 lines
The choice "a" will create the memory pressure in the fast memory node. If the memory pressure of the workload is high, the memory pressure may become so high that the memory allocation latency of the workload is influenced, e.g. the direct reclaiming may be triggered.
The choice "b" works much better at this aspect. If the memory pressure of the workload is high, the hot pages promotion will stop earlier because its allocation watermark is higher than that of the normal memory allocation. So in this patch, choice "b" is implemented.
In addition to the original page placement optimization among sockets, the NUMA balancing mechanism is extended to be used to optimize page placement according to hot/cold among different memory types. So the sysctl user space interface (
numa_balancing) is extended in a backward compatible way as follow, so that the users can enable/disable these functionality individually.The sysctl is converted from a Boolean value to a bits field. The definition of the flags is,
-
0x0:NUMA_BALANCING_DISABLED
-0x1:NUMA_BALANCING_NORMAL
-0x2:NUMA_BALANCING_MEMORY_TIERINGSigned-off-by "Huang, Ying" <[email protected]>Cc Andrew Morton <[email protected]>Cc Michal Hocko <[email protected]>Cc Rik van Riel <[email protected]>Cc Mel Gorman <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Dave Hansen <[email protected]>Cc Yang Shi <[email protected]>Cc Zi Yan <[email protected]>Cc Wei Xu <[email protected]>Cc osalvador <[email protected]>Cc Shakeel Butt <[email protected]>--- Documentation/admin-guide/sysctl/kernel.rst | 29 ++++++++++++++------- include/linux/sched/sysctl.h | 10 +++++++ kernel/sched/core.c | 21 ++++++++++++--- kernel/sysctl.c | 3 ++- mm/migrate.c | 19 ++++++++++++-- mm/vmscan.c | 16 ++++++++++++ 6 files changed, 82 insertions(+), 16 deletions(-)Documentation/admin-guide/sysctl/kernel.rst +20
-9@@ -595,16 +595,23 @@ Documentation/admin-guide/kernel-parameters.rst). numa_balancing ============== -Enables/disables automatic page fault based NUMA memory -balancing. Memory is moved automatically to nodes -that access it often. +Enables/disables and configure automatic page fault based NUMA memory +balancing. Memory is moved automatically to nodes that access it +often. The value to set can be the result to OR the following, -Enables/disables automatic NUMA memory balancing. On NUMA machines, there -is a performance penalty if remote memory is accessed by a CPU. When this -feature is enabled the kernel samples what task thread is accessing memory -by periodically unmapping pages and later trapping a page fault. At the -time of the page fault, it is determined if the data being accessed should -be migrated to a local memory node. += ================================= +0x0 NUMA_BALANCING_DISABLED +0x1 NUMA_BALANCING_NORMAL +0x2 NUMA_BALANCING_MEMORY_TIERING += ================================= + +Or NUMA_BALANCING_NORMAL to optimize page placement among different +NUMA nodes to reduce remote accessing. On NUMA machines, there is a +performance penalty if remote memory is accessed by a CPU. When this +feature is enabled the kernel samples what task thread is accessing +memory by periodically unmapping pages and later trapping a page +fault. At the time of the page fault, it is determined if the data +being accessed should be migrated to a local memory node. The unmapping of pages and trapping faults incur additional overhead that ideally is offset by improved memory locality but there is no universal@@ -615,6 +622,10 @@ faults may be controlled by the `numa_balancing_scan_period_min_ms, numa_balancing_scan_delay_ms, numa_balancing_scan_period_max_ms, numa_balancing_scan_size_mb`_, and numa_balancing_settle_count sysctls. +Or NUMA_BALANCING_MEMORY_TIERING to optimize page placement among +different types of memory (represented as different NUMA nodes) to +place the hot pages in the fast memory. This is implemented based on +unmapping and page fault too. numa_balancing_scan_period_min_ms, numa_balancing_scan_delay_ms, numa_balancing_scan_period_max_ms, numa_balancing_scan_size_mb ===============================================================================================================================include/linux/sched/sysctl.h +10
-0@@ -35,6 +35,16 @@ enum sched_tunable_scaling { SCHED_TUNABLESCALING_END, }; +#define NUMA_BALANCING_DISABLED 0x0 +#define NUMA_BALANCING_NORMAL 0x1 +#define NUMA_BALANCING_MEMORY_TIERING 0x2 + +#ifdef CONFIG_NUMA_BALANCING +extern int sysctl_numa_balancing_mode; +#else +#define sysctl_numa_balancing_mode 0 +#endif +/* * control realtime throttling: * kernel/sched/core.c +17
-4@@ -4265,7 +4265,9 @@ DEFINE_STATIC_KEY_FALSE(sched_numa_balancing);#ifdef CONFIG_NUMA_BALANCING -void set_numabalancing_state (bool enabled) +int sysctl_numa_balancing_mode; + +static void __set_numabalancing_state (bool enabled) {if (enabled)static_branch_enable (&sched_numa_balancing);@@ -4273,13 +4275,22 @@ void set_numabalancing_state(bool enabled)static_branch_disable (&sched_numa_balancing); } +void set_numabalancing_state (bool enabled) +{ +if (enabled) + sysctl_numa_balancing_mode =NUMA_BALANCING_NORMAL ; +else + sysctl_numa_balancing_mode =NUMA_BALANCING_DISABLED ; +__set_numabalancing_state (enabled); +} +#ifdef CONFIG_PROC_SYSCTL int sysctl_numa_balancing (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table t;int err; -int state =static_branch_likely (&sched_numa_balancing); +int state = sysctl_numa_balancing_mode;if (write && !capable (CAP_SYS_ADMIN ))return -EPERM ;@@ -4289,8 +4300,10 @@ int sysctl_numa_balancing(struct ctl_table *table, int write, err =proc_dointvec_minmax (&t, write, buffer, lenp, ppos);if (err <0 )return err; -if (write) -set_numabalancing_state (state); +if (write) { + sysctl_numa_balancing_mode = state; +__set_numabalancing_state (state); + } return err; }#endif kernel/sysctl.c +2
-1@@ -115,6 +115,7 @@ static int sixty = 60;static int __maybe_unused neg_one =-1 ;static int __maybe_unused two =2 ; +static int __maybe_unused three =3 ;static int __maybe_unused four =4 ;static unsigned long zero_ul;static unsigned long one_ul =1 ;@@ -1808,7 +1809,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = sysctl_numa_balancing, .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, + .extra2 = &three, },#endif /* CONFIG_NUMA_BALANCING */ {mm/migrate.c +17
-2@@ -50,6 +50,7 @@#include <linux/ptrace.h> #include <linux/oom.h> #include <linux/memory.h> +#include <linux/sched/sysctl.h> #include <asm/tlbflush.h> @@ -2103,16 +2104,30 @@ static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) {int page_lru;int nr_pages =thp_nr_pages (page); +int order =compound_order (page); -VM_BUG_ON_PAGE (compound_order (page) && !PageTransHuge (page), page); +VM_BUG_ON_PAGE (order && !PageTransHuge (page), page);/* Do not migrate THP mapped by multiple processes */ if (PageTransHuge (page) &&total_mapcount (page) >1 )return 0 ;/* Avoid migrating to a node that is nearly full */ -if (!migrate_balanced_pgdat (pgdat, nr_pages)) +if (!migrate_balanced_pgdat (pgdat, nr_pages)) { +int z; + +if (!(sysctl_numa_balancing_mode &NUMA_BALANCING_MEMORY_TIERING ) || + !numa_demotion_enabled) +return 0 ; +if (next_demotion_node (pgdat->node_id) ==NUMA_NO_NODE ) +return 0 ; +for (z = pgdat->nr_zones -1 ; z >=0 ; z--) { +if (populated_zone (pgdat->node_zones + z)) +break ; + } +wakeup_kswapd (pgdat->node_zones + z,0 , order,ZONE_MOVABLE );return 0 ; + }if (isolate_lru_page (page))return 0 ;mm/vmscan.c +16
-0@@ -56,6 +56,7 @@#include <linux/swapops.h> #include <linux/balloon_compaction.h> +#include <linux/sched/sysctl.h> #include "internal.h" @@ -3908,6 +3909,12 @@ static bool pgdat_watermark_boosted(pg_data_t *pgdat, int highest_zoneidx)return false; } +/* +* Keep the free pages on fast memory node a little more than the high +* watermark to accommodate the promoted pages. +*/ +#define NUMA_BALANCING_PROMOTE_WATERMARK (10UL * 1024 * 1024 >> PAGE_SHIFT) +/* * Returns true if there is an eligible zone balanced for the request order * and highest_zoneidx @@ -3929,6 +3936,15 @@ static bool pgdat_balanced(pg_data_t *pgdat, int order, int highest_zoneidx)continue ; mark =high_wmark_pages (zone); +if (sysctl_numa_balancing_mode &NUMA_BALANCING_MEMORY_TIERING && + numa_demotion_enabled && +next_demotion_node (pgdat->node_id) !=NUMA_NO_NODE ) { +unsigned long promote_mark; + + promote_mark =min (NUMA_BALANCING_PROMOTE_WATERMARK , + pgdat->node_present_pages >>6 ); + mark += promote_mark; + }if (zone_watermark_ok_safe (zone, order, mark, highest_zoneidx))return true; }Signature · 1 line
2.30.2
--
Best Regards,
Yan, Zi
Re: [PATCH -V10 2/6] NUMA balancing: optimize page placement for memory tiering system
Hi, Zi,
Thanks for review!
Quoted 56 lines · Zi Yan
Quoted 41 lines · Huang Ying
With the advent of various new memory types, some machines will have multiple types of memory, e.g. DRAM and PMEM (persistent memory). The memory subsystem of these machines can be called memory tiering system, because the performance of the different types of memory are usually different.
In such system, because of the memory accessing pattern changing etc, some pages in the slow memory may become hot globally. So in this patch, the NUMA balancing mechanism is enhanced to optimize the page placement among the different memory types according to hot/cold dynamically.
In a typical memory tiering system, there are CPUs, fast memory and slow memory in each physical NUMA node. The CPUs and the fast memory will be put in one logical node (called fast memory node), while the slow memory will be put in another (faked) logical node (called slow memory node). That is, the fast memory is regarded as local while the slow memory is regarded as remote. So it's possible for the recently accessed pages in the slow memory node to be promoted to the fast memory node via the existing NUMA balancing mechanism.
The original NUMA balancing mechanism will stop to migrate pages if the free memory of the target node will become below the high watermark. This is a reasonable policy if there's only one memory type. But this makes the original NUMA balancing mechanism almost not work to optimize page placement among different memory types. Details are as follows.
It's the common cases that the working-set size of the workload is larger than the size of the fast memory nodes. Otherwise, it's unnecessary to use the slow memory at all. So in the common cases, there are almost always no enough free pages in the fast memory nodes, so that the globally hot pages in the slow memory node cannot be promoted to the fast memory node. To solve the issue, we have 2 choices as follows,
a. Ignore the free pages watermark checking when promoting hot pages
from the slow memory node to the fast memory node. This will create some memory pressure in the fast memory node, thus trigger the memory reclaiming. So that, the cold pages in the fast memory node will be demoted to the slow memory node.Quoted 8 lines
b. Make kswapd of the fast memory node to reclaim pages until the free
pages are a little more (about 10MB) than the high watermark. Then, if the free pages of the fast memory node reaches high watermark, and some hot pages need to be promoted, kswapd of the fast memory node will be waken up to demote some cold pages in the fast memory node to the slow memory node. This will free some extra space in the fast memory node, so the hot pages in the slow memory node can be promoted to the fast memory node.Why 10MB? Is 10MB big enough to avoid creating memory pressure on fast memory? This number seems pretty ad-hoc and may only work well on your test machine.
Quoted 6 lines
In theory, this extra free memory space should be related to page promotion throughput and kswapd demotion throughput, right? Patch 5 allows user to adjust page promotion throughput,
NUMA_BALANCING_PROMOTE_WATERMARKat least can be something like X *numa_balancing_rate_limit_mbps. Also, is there any way of measuring kswapd demotion throughput at boot time? So we can take it into account too. Does this make sense?
Yes. 10MB is just a ad-hoc number that happens work well on my test machine. And I am glad to discuss the proper value.
- The effect of the patchset will keep the size of the free memory in the DRAM node between HIGH_WATERMARK and HIGH_WATERMARK + PROMOTE_WATERMARK in normal cases. So PROMOTE_WATERMARK should be as small as possible to take full advantage of the valuable DRAM.
- The PROMOTE_WATERMARK should be larger than the max per-CPU counter error. So that migrate_balanced_pgdat() for promotion and pgdat_balanced() for demotion can cooperate.
- The PROMOTE_WATERMARK should be large enough to batch the demotion.
- If the promotion speed is slower than the demotion speed, the larger the PROMOTE_WATERMARK, the longer the sleep time of kswapd. If the promotion speed is faster than the demotion speed, kswapd will keep running until promotion is rate limited at least.
So, if we set PROMOTE_WATERMARK as N * numa_balancing_rate_limit_mbps, then kswapd will sleep about N seconds after the number of the free pages reaches PROMOTE_WATERMARK. Is that expected?
All in all, I don't think some ad-hoc number such as 10MB is good enough. And the solution adopted in this patch should be as simple as possible. This will provide a baseline, so that we can improve it later with more sophisticated solution with the numbers. Do you agree?
Best Regards,
Huang, Ying
Quoted 26 lines
Quoted 26 lines
The choice "a" will create the memory pressure in the fast memory node. If the memory pressure of the workload is high, the memory pressure may become so high that the memory allocation latency of the workload is influenced, e.g. the direct reclaiming may be triggered.
The choice "b" works much better at this aspect. If the memory pressure of the workload is high, the hot pages promotion will stop earlier because its allocation watermark is higher than that of the normal memory allocation. So in this patch, choice "b" is implemented.
In addition to the original page placement optimization among sockets, the NUMA balancing mechanism is extended to be used to optimize page placement according to hot/cold among different memory types. So the sysctl user space interface (
numa_balancing) is extended in a backward compatible way as follow, so that the users can enable/disable these functionality individually.The sysctl is converted from a Boolean value to a bits field. The definition of the flags is,
-
0x0:NUMA_BALANCING_DISABLED
-0x1:NUMA_BALANCING_NORMAL
-0x2:NUMA_BALANCING_MEMORY_TIERING
Quoted 14 lines
Quoted 6 lines
Signed-off-by "Huang, Ying" <[email protected]>Cc Andrew Morton <[email protected]>Cc Michal Hocko <[email protected]>Cc Rik van Riel <[email protected]>Cc Mel Gorman <[email protected]>Cc Peter Zijlstra <[email protected]>Quoted 8 lines
Cc Dave Hansen <[email protected]>Cc Yang Shi <[email protected]>Cc Zi Yan <[email protected]>Cc Wei Xu <[email protected]>Cc osalvador <[email protected]>Cc Shakeel Butt <[email protected]>
[snip]
Best Regards,
Huang, Ying
PATCH 3/6 memory tiering: skip to scan fast memory
In reply to Huang YingIf the NUMA balancing isn't used to optimize the page placement among sockets but only among memory types, the hot pages in the fast memory node couldn't be migrated (promoted) to anywhere. So it's unnecessary to scan the pages in the fast memory node via changing their PTE/PMD mapping to be PROT_NONE. So that the page faults could be avoided too.
In the test, if only the memory tiering NUMA balancing mode is enabled, the number of the NUMA balancing hint faults for the DRAM node is reduced to almost 0 with the patch. While the benchmark score doesn't change visibly.
--- mm/huge_memory.c | 30 +++++++++++++++++++++--------- mm/mprotect.c | 13 ++++++++++++- 2 files changed, 33 insertions(+), 10 deletions(-)
mm/huge_memory.c +21 -9
@@ -34,6 +34,7 @@#include <linux/oom.h> #include <linux/numa.h> #include <linux/page_owner.h> +#include <linux/sched/sysctl.h> #include <asm/tlb.h> #include <asm/pgalloc.h>
@@ -1766,17 +1767,28 @@ int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, }#endif -/* -* Avoid trapping faults against the zero page. The read-only -* data is likely to be read-cached on the local CPU and -* local/remote hits to the zero page are not interesting. -*/ -if (prot_numa &&is_huge_zero_pmd (*pmd)) - goto unlock; +if (prot_numa) { +struct page *page; +/* +* Avoid trapping faults against the zero page. The read-only +* data is likely to be read-cached on the local CPU and +* local/remote hits to the zero page are not interesting. +*/ +if (is_huge_zero_pmd (*pmd)) + goto unlock; -if (prot_numa &&pmd_protnone (*pmd)) - goto unlock; +if (pmd_protnone (*pmd)) + goto unlock; + page =pmd_page (*pmd); +/* +* Skip scanning top tier node if normal numa +* balancing is disabled +*/ +if (!(sysctl_numa_balancing_mode &NUMA_BALANCING_NORMAL ) && +node_is_toptier (page_to_nid (page))) + goto unlock; + }/* * In case prot_numa, we are under mmap_read_lock(mm). It's critical * to not clear pmd intermittently to avoid race with MADV_DONTNEED
mm/mprotect.c +12 -1
@@ -29,6 +29,7 @@#include <linux/uaccess.h> #include <linux/mm_inline.h> #include <linux/pgtable.h> +#include <linux/sched/sysctl.h> #include <asm/cacheflush.h> #include <asm/mmu_context.h> #include <asm/tlbflush.h>
@@ -83,6 +84,7 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,*/ if (prot_numa) {struct page *page; +int nid;/* Avoid TLB flush if possible */ if (pte_protnone (oldpte))
@@ -109,7 +111,16 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,* Don't mess with PTEs if page is already on the node * a single-threaded process is running on. */ -if (target_node ==page_to_nid (page)) + nid =page_to_nid (page); +if (target_node == nid) +continue ; + +/* +* Skip scanning top tier node if normal numa +* balancing is disabled +*/ +if (!(sysctl_numa_balancing_mode &NUMA_BALANCING_NORMAL ) && +node_is_toptier (nid))continue ; }
Signature · 1 line
2.30.2
PATCH 4/6 memory tiering: hot page selection with hint page fault latency
In reply to Huang YingTo optimize page placement in a memory tiering system with NUMA balancing, the hot pages in the slow memory node need to be identified. Essentially, the original NUMA balancing implementation selects the mostly recently accessed (MRU) pages as the hot pages. But this isn't a very good algorithm to identify the hot pages.
So, in this patch we implemented a better hot page selection algorithm. Which is based on NUMA balancing page table scanning and hint page fault as follows,
- When the page tables of the processes are scanned to change PTE/PMD to be PROT_NONE, the current time is recorded in struct page as scan time.
- When the page is accessed, hint page fault will occur. The scan time is gotten from the struct page. And The hint page fault latency is defined as
hint page fault time - scan time
The shorter the hint page fault latency of a page is, the higher the probability of their access frequency to be higher. So the hint page fault latency is a good estimation of the page hot/cold.
But it's hard to find some extra space in struct page to hold the scan time. Fortunately, we can reuse some bits used by the original NUMA balancing.
NUMA balancing uses some bits in struct page to store the page accessing CPU and PID (referring to page_cpupid_xchg_last()). Which is used by the multi-stage node selection algorithm to avoid to migrate pages shared accessed by the NUMA nodes back and forth. But for pages in the slow memory node, even if they are shared accessed by multiple NUMA nodes, as long as the pages are hot, they need to be promoted to the fast memory node. So the accessing CPU and PID information are unnecessary for the slow memory pages. We can reuse these bits in struct page to record the scan time for them. For the fast memory pages, these bits are used as before.
The remaining problem is how to determine the hot threshold. It's not easy to be done automatically. So we provide a sysctl knob:
kernel.numa_balancing_hot_threshold_ms. All pages with hint page fault latency < the threshold will be considered hot. The system administrator can determine the hot threshold via various information, such as PMEM bandwidth limit, the average number of the pages pass the hot threshold, etc. The default hot threshold is 1 second, which works well in our performance test.
The downside of the patch is that the response time to the workload hot spot changing may be much longer. For example,
- A previous cold memory area becomes hot
- The hint page fault will be triggered. But the hint page fault latency isn't shorter than the hot threshold. So the pages will not be promoted.
- When the memory area is scanned again, maybe after a scan period, the hint page fault latency measured will be shorter than the hot threshold and the pages will be promoted.
To mitigate this,
- If there are enough free space in the fast memory node, the hot threshold will not be used, all pages will be promoted upon the hint page fault for fast response.
- If fast response is more important for system performance, the administrator can set a higher hot threshold.
--- include/linux/mm.h | 29 ++++++++++++++++ include/linux/sched/sysctl.h | 1 + kernel/sched/fair.c | 67 ++++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 7 ++++ mm/huge_memory.c | 13 +++++-- mm/memory.c | 11 +++++- mm/migrate.c | 12 +++++++ mm/mmzone.c | 17 +++++++++ mm/mprotect.c | 8 ++++- 9 files changed, 160 insertions(+), 5 deletions(-)
include/linux/mm.h +29 -0
@@ -1393,6 +1393,18 @@ static inline int folio_nid(const struct folio *folio) }#ifdef CONFIG_NUMA_BALANCING +/* page access time bits needs to hold at least 4 seconds */ +#define PAGE_ACCESS_TIME_MIN_BITS 12 +#if LAST_CPUPID_SHIFT <PAGE_ACCESS_TIME_MIN_BITS +#define PAGE_ACCESS_TIME_BUCKETS \ + (PAGE_ACCESS_TIME_MIN_BITS - LAST_CPUPID_SHIFT) +#else +#define PAGE_ACCESS_TIME_BUCKETS 0 +#endif + +#define PAGE_ACCESS_TIME_MASK \ + (LAST_CPUPID_MASK << PAGE_ACCESS_TIME_BUCKETS) +static inline int cpu_pid_to_cpupid (int cpu,int pid) {return ((cpu &LAST__CPU_MASK ) <<LAST__PID_SHIFT ) | (pid &LAST__PID_MASK );
@@ -1435,6 +1447,16 @@ static inline int page_cpupid_xchg_last(struct page *page, int cpupid)return xchg (&page->_last_cpupid, cpupid &LAST_CPUPID_MASK ); } +static inline unsigned int xchg_page_access_time (struct page *page, +unsigned int time) +{ +unsigned int last_time; + + last_time =xchg (&page->_last_cpupid, + (time >>PAGE_ACCESS_TIME_BUCKETS ) &LAST_CPUPID_MASK ); +return last_time <<PAGE_ACCESS_TIME_BUCKETS ; +} +static inline int page_cpupid_last (struct page *page) {return page->_last_cpupid;
@@ -1450,6 +1472,7 @@ static inline int page_cpupid_last(struct page *page) }extern int page_cpupid_xchg_last (struct page *page,int cpupid); +extern unsigned int xchg_page_access_time (struct page *page,unsigned int time);static inline void page_cpupid_reset_last (struct page *page) {
@@ -1462,6 +1485,12 @@ static inline int page_cpupid_xchg_last(struct page *page, int cpupid)return page_to_nid (page);/* XXX */ } +static inline unsigned int xchg_page_access_time (struct page *page, +unsigned int time) +{ +return 0 ; +} +static inline int page_cpupid_last (struct page *page) {return page_to_nid (page);/* XXX */
include/linux/sched/sysctl.h +1 -0
@@ -41,6 +41,7 @@ enum sched_tunable_scaling {#ifdef CONFIG_NUMA_BALANCING extern int sysctl_numa_balancing_mode; +extern unsigned int sysctl_numa_balancing_hot_threshold;#else #define sysctl_numa_balancing_mode 0#endif
kernel/sched/fair.c +67 -0
97 lines not on this page · raw message
kernel/sysctl.c +7 -0
@@ -1811,6 +1811,13 @@ static struct ctl_table kern_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = &three, }, + { + .procname = "numa_balancing_hot_threshold_ms", + .data = &sysctl_numa_balancing_hot_threshold, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = proc_dointvec, + },#endif /* CONFIG_NUMA_BALANCING */ { .procname = "sched_rt_period_us",
mm/huge_memory.c +10 -3
@@ -1430,7 +1430,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf)struct page *page;unsigned long haddr = vmf->address &HPAGE_PMD_MASK ;int page_nid =NUMA_NO_NODE ; -int target_nid, last_cpupid =-1 ; +int target_nid, last_cpupid = (-1 &LAST_CPUPID_MASK );bool migrated = false;bool was_writable =pmd_savedwrite (oldpmd);int flags =0 ;
@@ -1451,7 +1451,8 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) flags |=TNF_NO_GROUP ; page_nid =page_to_nid (page); - last_cpupid =page_cpupid_last (page); +if (node_is_toptier (page_nid)) + last_cpupid =page_cpupid_last (page); target_nid =numa_migrate_prep (page, vma, haddr, page_nid, &flags);
@@ -1769,6 +1770,7 @@ int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,if (prot_numa) {struct page *page; +bool toptier;/* * Avoid trapping faults against the zero page. The read-only * data is likely to be read-cached on the local CPU and
@@ -1781,13 +1783,18 @@ int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, goto unlock; page =pmd_page (*pmd); + toptier =node_is_toptier (page_to_nid (page));/* * Skip scanning top tier node if normal numa * balancing is disabled */ if (!(sysctl_numa_balancing_mode &NUMA_BALANCING_NORMAL ) && -node_is_toptier (page_to_nid (page))) + toptier) goto unlock; + +if (sysctl_numa_balancing_mode &NUMA_BALANCING_MEMORY_TIERING && + !toptier) +xchg_page_access_time (page,jiffies_to_msecs (jiffies)); }/* * In case prot_numa, we are under mmap_read_lock(mm). It's critical
mm/memory.c +10 -1
@@ -73,6 +73,7 @@#include <linux/perf_event.h> #include <linux/ptrace.h> #include <linux/vmalloc.h> +#include <linux/sched/sysctl.h> #include <trace/events/kmem.h>
@@ -4371,8 +4372,16 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf)if (page_mapcount (page) >1 && (vma->vm_flags &VM_SHARED )) flags |=TNF_SHARED ; - last_cpupid =page_cpupid_last (page); page_nid =page_to_nid (page); +/* +* In 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 (page_nid)) + last_cpupid = (-1 &LAST_CPUPID_MASK ); +else + last_cpupid =page_cpupid_last (page); target_nid =numa_migrate_prep (page, vma, vmf->address, page_nid, &flags);if (target_nid ==NUMA_NO_NODE ) {
mm/migrate.c +12 -0
@@ -572,6 +572,18 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio)* future migrations of this same page. */ cpupid =page_cpupid_xchg_last (&folio->page,-1 ); +/* +* If 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)); + +if (f_toptier != t_toptier) + cpupid =-1 ; + }page_cpupid_xchg_last (&newfolio->page, cpupid);folio_migrate_ksm (newfolio, folio);
mm/mmzone.c +17 -0
@@ -99,4 +99,21 @@ int page_cpupid_xchg_last(struct page *page, int cpupid) return last_cpupid; } + +unsigned int xchg_page_access_time (struct page *page,unsigned int time) +{ +unsigned long old_flags, flags; +unsigned int last_time; + + time >>=PAGE_ACCESS_TIME_BUCKETS ; +do { + old_flags = flags = page->flags; + last_time = (flags >>LAST_CPUPID_PGSHIFT ) &LAST_CPUPID_MASK ; + + flags &= ~(LAST_CPUPID_MASK <<LAST_CPUPID_PGSHIFT ); + flags |= (time &LAST_CPUPID_MASK ) <<LAST_CPUPID_PGSHIFT ; + }while (unlikely (cmpxchg (&page->flags, old_flags, flags) != old_flags)); + +return last_time <<PAGE_ACCESS_TIME_BUCKETS ; +}#endif
mm/mprotect.c +7 -1
@@ -85,6 +85,7 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,if (prot_numa) {struct page *page;int nid; +bool toptier;/* Avoid TLB flush if possible */ if (pte_protnone (oldpte))
@@ -114,14 +115,19 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd, nid =page_to_nid (page);if (target_node == nid)continue ; + toptier =node_is_toptier (nid);/* * Skip scanning top tier node if normal numa * balancing is disabled */ if (!(sysctl_numa_balancing_mode &NUMA_BALANCING_NORMAL ) && -node_is_toptier (nid)) + toptier)continue ; +if (sysctl_numa_balancing_mode &NUMA_BALANCING_MEMORY_TIERING && + !toptier) +xchg_page_access_time (page, +jiffies_to_msecs (jiffies)); } oldpte =ptep_modify_prot_start (vma, addr, pte);
Signature · 1 line
2.30.2
PATCH 5/6 memory tiering: rate limit NUMA migration throughput
In reply to Huang YingIn NUMA balancing memory tiering mode, the hot slow memory pages could be promoted to the fast memory node via NUMA balancing. But this incurs some overhead too. So that sometimes the workload performance may be hurt. To avoid too much disturbing to the workload in these situations, we should make it possible to rate limit the promotion throughput.
So, in this patch, we implement a simple rate limit algorithm as follows. The number of the candidate pages to be promoted to the fast memory node via NUMA balancing is counted, if the count exceeds the limit specified by the users, the NUMA balancing promotion will be stopped until the next second.
A new sysctl knob kernel.numa_balancing_rate_limit_mbps is added for the users to specify the limit.
TODO: Add ABI document for new sysctl knob.
--- include/linux/mmzone.h | 5 +++++ include/linux/sched/sysctl.h | 1 + kernel/sched/fair.c | 29 +++++++++++++++++++++++++++-- kernel/sysctl.c | 8 ++++++++ mm/vmstat.c | 1 + 5 files changed, 42 insertions(+), 2 deletions(-)
include/linux/mmzone.h +5 -0
@@ -213,6 +213,7 @@ enum node_stat_item {#endif #ifdef CONFIG_NUMA_BALANCING PGPROMOTE_SUCCESS ,/* promote successfully */ +PGPROMOTE_CANDIDATE ,/* candidate pages to promote */ #endifNR_VM_NODE_STAT_ITEMS };
@@ -902,6 +903,10 @@ typedef struct pglist_data {struct deferred_split deferred_split_queue;#endif +#ifdef CONFIG_NUMA_BALANCING +unsigned long numa_ts; +unsigned long numa_nr_candidate; +#endif /* Fields commonly accessed by the page reclaim scanner */ /*
include/linux/sched/sysctl.h +1 -0
@@ -42,6 +42,7 @@ enum sched_tunable_scaling {#ifdef CONFIG_NUMA_BALANCING extern int sysctl_numa_balancing_mode;extern unsigned int sysctl_numa_balancing_hot_threshold; +extern unsigned int sysctl_numa_balancing_rate_limit;#else #define sysctl_numa_balancing_mode 0#endif
kernel/sched/fair.c +27 -2
@@ -1028,6 +1028,11 @@ unsigned int sysctl_numa_balancing_scan_delay = 1000;/* The page with hint page fault latency < threshold in ms is considered hot */ unsigned int sysctl_numa_balancing_hot_threshold =1000 ; +/* +* Restrict the NUMA migration per second in MB for each target node +* if no enough free space in target node +*/ +unsigned int sysctl_numa_balancing_rate_limit =65536 ;struct numa_group {refcount_t refcount;
@@ -1401,6 +1406,23 @@ static int numa_hint_fault_latency(struct page *page)return (time - last_time) &PAGE_ACCESS_TIME_MASK ; } +static bool numa_migration_check_rate_limit (struct pglist_data *pgdat, +unsigned long rate_limit,int nr) +{ +unsigned long nr_candidate; +unsigned long now = jiffies, last_ts; + +mod_node_page_state (pgdat,PGPROMOTE_CANDIDATE , nr); + nr_candidate =node_page_state (pgdat,PGPROMOTE_CANDIDATE ); + last_ts = pgdat->numa_ts; +if (now > last_ts +HZ && +cmpxchg (&pgdat->numa_ts, last_ts, now) == last_ts) + pgdat->numa_nr_candidate = nr_candidate; +if (nr_candidate - pgdat->numa_nr_candidate > rate_limit) +return false; +return true; +} +bool should_numa_migrate_memory (struct task_struct *p,struct page * page,int src_nid,int dst_cpu) {
@@ -1415,7 +1437,7 @@ bool should_numa_migrate_memory(struct task_struct *p, struct page * page,if (sysctl_numa_balancing_mode &NUMA_BALANCING_MEMORY_TIERING && !node_is_toptier (src_nid)) {struct pglist_data *pgdat; -unsigned long latency, th; +unsigned long rate_limit, latency, th; pgdat =NODE_DATA (dst_nid);if (pgdat_free_space_enough (pgdat))
@@ -1426,7 +1448,10 @@ bool should_numa_migrate_memory(struct task_struct *p, struct page * page,if (latency > th)return false; -return true; + rate_limit = + sysctl_numa_balancing_rate_limit << (20 -PAGE_SHIFT ); +return numa_migration_check_rate_limit (pgdat, rate_limit, +thp_nr_pages (page)); } this_cpupid =cpu_pid_to_cpupid (dst_cpu, current->pid);
kernel/sysctl.c +8 -0
@@ -1818,6 +1818,14 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, + { + .procname = "numa_balancing_rate_limit_mbps", + .data = &sysctl_numa_balancing_rate_limit, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + },#endif /* CONFIG_NUMA_BALANCING */ { .procname = "sched_rt_period_us",
mm/vmstat.c +1 -0
@@ -1244,6 +1244,7 @@ const char * const vmstat_text[] = {#endif #ifdef CONFIG_NUMA_BALANCING "pgpromote_success", + "pgpromote_candidate",#endif /* enum writeback_stat_item counters */
Signature · 1 line
2.30.2
PATCH 6/6 memory tiering: adjust hot threshold automatically
In reply to Huang YingIt isn't easy for the administrator to determine the hot threshold. So in this patch, a method to adjust the hot threshold automatically is implemented. The basic idea is to control the number of the candidate promotion pages to match the promotion rate limit. If the hint page fault latency of a page is less than the hot threshold, we will try to promote the page, and the page is called the candidate promotion page.
If the number of the candidate promotion pages in the statistics interval is much more than the promotion rate limit, the hot threshold will be decreased to reduce the number of the candidate promotion pages. Otherwise, the hot threshold will be increased to increase the number of the candidate promotion pages.
To make the above method works, in each statistics interval, the total number of the pages to check (on which the hint page faults occur) and the hot/cold distribution need to be stable. Because the page tables are scanned linearly in NUMA balancing, but the hot/cold distribution isn't uniform along the address, the statistics interval should be larger than the NUMA balancing scan period. So in the patch, the max scan period is used as statistics interval and it works well in our tests.
The sysctl knob kernel.numa_balancing_hot_threshold_ms becomes the initial value and max value of the hot threshold.
--- include/linux/mmzone.h | 3 ++ include/linux/sched/sysctl.h | 2 ++ kernel/sched/core.c | 15 +++++++++ kernel/sched/fair.c | 64 +++++++++++++++++++++++++++++++++--- kernel/sysctl.c | 3 +- 5 files changed, 81 insertions(+), 6 deletions(-)
include/linux/mmzone.h +3 -0
@@ -906,6 +906,9 @@ typedef struct pglist_data {#ifdef CONFIG_NUMA_BALANCING unsigned long numa_ts;unsigned long numa_nr_candidate; +unsigned long numa_threshold_ts; +unsigned long numa_threshold_nr_candidate; +unsigned long numa_threshold;#endif /* Fields commonly accessed by the page reclaim scanner */
include/linux/sched/sysctl.h +2 -0
@@ -84,6 +84,8 @@ int sysctl_sched_uclamp_handler(struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos);int sysctl_numa_balancing (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos); +int sysctl_numa_balancing_threshold (struct ctl_table *table,int write,void *buffer, +size_t *lenp,loff_t *ppos);int sysctl_schedstats (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos);
kernel/sched/core.c +15 -0
@@ -4285,6 +4285,18 @@ void set_numabalancing_state(bool enabled) }#ifdef CONFIG_PROC_SYSCTL +static void reset_memory_tiering (void ) +{ +struct pglist_data *pgdat; + +for_each_online_pgdat (pgdat) { + pgdat->numa_threshold =0 ; + pgdat->numa_threshold_nr_candidate = +node_page_state (pgdat,PGPROMOTE_CANDIDATE ); + pgdat->numa_threshold_ts = jiffies; + } +} +int sysctl_numa_balancing (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos) {
@@ -4301,6 +4313,9 @@ int sysctl_numa_balancing(struct ctl_table *table, int write,if (err <0 )return err;if (write) { +if (!(sysctl_numa_balancing_mode &NUMA_BALANCING_MEMORY_TIERING ) && + (state &NUMA_BALANCING_MEMORY_TIERING )) +reset_memory_tiering (); sysctl_numa_balancing_mode = state;__set_numabalancing_state (state); }
kernel/sched/fair.c +59 -5
84 lines not on this page · raw message
kernel/sysctl.c +2 -1
@@ -1816,7 +1816,8 @@ static struct ctl_table kern_table[] = { .data = &sysctl_numa_balancing_hot_threshold, .maxlen = sizeof(unsigned int), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = sysctl_numa_balancing_threshold, + .extra1 = SYSCTL_ZERO, }, { .procname = "numa_balancing_rate_limit_mbps",
Signature · 1 line
2.30.2