mm, mem-hotplug: recalculate lowmem_reserve when memory hotplug occur
Subsystems (4)
PATCH 1/2 mm, mem-hotplug: recalculate lowmem_reserve when memory hotplug occur
Currently, memory hotplug call setup_per_zone_wmarks() and calculate_zone_inactive_ratio(), but don't call setup_per_zone_lowmem_reserve().
It mean number of reserved pages aren't updated even if memory hot plug occur. This patch fixes it.
--- include/linux/mm.h | 3 +-- mm/memory_hotplug.c | 9 +++++---- mm/page_alloc.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
include/linux/mm.h +1 -2
@@ -1221,8 +1221,7 @@ extern int __meminit __early_pfn_to_nid(unsigned long pfn);extern void set_dma_reserve (unsigned long new_dma_reserve);extern void memmap_init_zone (unsigned long ,int ,unsigned long ,unsigned long ,enum memmap_context ); -extern void setup_per_zone_wmarks (void ); -extern void calculate_zone_inactive_ratio (struct zone *zone); +extern int __meminit init_per_zone_wmark_min (void );extern void mem_init (void );extern void __init mmap_init (void );extern void show_mem (void );
mm/memory_hotplug.c +5 -4
@@ -437,8 +437,9 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)zone_pcp_update (zone);mutex_unlock (&zonelists_mutex); -setup_per_zone_wmarks (); -calculate_zone_inactive_ratio (zone); + +init_per_zone_wmark_min (); +if (onlined_pages) {kswapd_run (zone_to_nid (zone));node_set_state (zone_to_nid (zone),N_HIGH_MEMORY );
@@ -872,8 +873,8 @@ repeat: zone->zone_pgdat->node_present_pages -= offlined_pages; totalram_pages -= offlined_pages; -setup_per_zone_wmarks (); -calculate_zone_inactive_ratio (zone); +init_per_zone_wmark_min (); +if (!node_present_pages (node)) {node_clear_state (node,N_HIGH_MEMORY );kswapd_stop (node);
mm/page_alloc.c +3 -3
@@ -4880,7 +4880,7 @@ static void setup_per_zone_lowmem_reserve(void)* Ensures that the watermark[min,low,high] values for each zone are set * correctly with respect to min_free_kbytes. */ -void setup_per_zone_wmarks (void ) +static void setup_per_zone_wmarks (void ) {unsigned long pages_min = min_free_kbytes >> (PAGE_SHIFT -10 );unsigned long lowmem_pages =0 ;
@@ -4956,7 +4956,7 @@ void setup_per_zone_wmarks(void)* 1TB 101 10GB * 10TB 320 32GB */ -void calculate_zone_inactive_ratio (struct zone *zone) +static void calculate_zone_inactive_ratio (struct zone *zone) {unsigned int gb, ratio;
@@ -5002,7 +5002,7 @@ static void __init setup_per_zone_inactive_ratio(void)* 8192MB: 11584k * 16384MB: 16384k */ -static int __init init_per_zone_wmark_min (void ) +int __meminit init_per_zone_wmark_min (void ) {unsigned long lowmem_kbytes;
Signature · 1 line
1.6.5.2
PATCH 2/2 mm, mem-hotplug: update pcp->stat_threshold when memory hotplug occur
Currently, cpu hotplug updates pcp->stat_threashold, but memory hotplug doesn't. there is no reason.
--- include/linux/vmstat.h | 5 ++++- mm/page_alloc.c | 2 ++ mm/vmstat.c | 5 ++--- 3 files changed, 8 insertions(+), 4 deletions(-)
include/linux/vmstat.h +4 -1
@@ -254,6 +254,7 @@ extern void dec_zone_state(struct zone *, enum zone_stat_item);extern void __dec_zone_state (struct zone *,enum zone_stat_item );void refresh_cpu_vm_stats (int ); +void refresh_zone_stat_thresholds (void );#else /* CONFIG_SMP */ /*
@@ -299,6 +300,8 @@ static inline void __dec_zone_page_state(struct page *page,#define mod_zone_page_state __mod_zone_page_statestatic inline void refresh_cpu_vm_stats (int cpu) { } -#endif +static inline void refresh_zone_stat_thresholds (void ) { } + +#endif /* CONFIG_SMP */ #endif /* _LINUX_VMSTAT_H */
mm/page_alloc.c +2 -0
@@ -51,6 +51,7 @@#include <linux/kmemleak.h> #include <linux/memory.h> #include <linux/compaction.h> +#include <linux/vmstat.h> #include <trace/events/kmem.h> #include <linux/ftrace_event.h>
@@ -5014,6 +5015,7 @@ int __meminit init_per_zone_wmark_min(void)if (min_free_kbytes >65536 ) min_free_kbytes =65536 ;setup_per_zone_wmarks (); +refresh_zone_stat_thresholds ();setup_per_zone_lowmem_reserve ();setup_per_zone_inactive_ratio ();return 0 ;
mm/vmstat.c +2 -3
@@ -133,7 +133,7 @@ static int calculate_threshold(struct zone *zone)/* * Refresh the thresholds for each zone. */ -static void refresh_zone_stat_thresholds (void ) +void refresh_zone_stat_thresholds (void ) {struct zone *zone;int cpu;
@@ -371,7 +371,7 @@ void refresh_cpu_vm_stats(int cpu) atomic_long_add(global_diff[i], &vm_stat[i]); } -#endif +#endif /* CONFIG_SMP */ #ifdef CONFIG_NUMA /*
@@ -1059,7 +1059,6 @@ static int __init setup_vmstat(void)#ifdef CONFIG_SMP int cpu; -refresh_zone_stat_thresholds ();register_cpu_notifier (&vmstat_notifier);for_each_online_cpu (cpu)
Signature · 1 line
1.6.5.2
mm/page_alloc.c static void __init setup_per_zone_inactive_ratio(void) · line 5008
Quoted 13 lines · KOSAKI Motohiro
mm/page_alloc.c +1
-1@@ -5002,7 +5002,7 @@ static void __init setup_per_zone_inactive_ratio(void)* 8192MB: 11584k * 16384MB: 16384k */ -static int __init init_per_zone_wmark_min (void ) +int __meminit init_per_zone_wmark_min (void ) {unsigned long lowmem_kbytes;
setup_per_zone_inactive_ratio() should be moved from __init to __meminit, right?
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 18 lines · KOSAKI Motohiro
Quoted 6 lines
mm/page_alloc.c +0
-0mm/page_alloc.c static void __init setup_per_zone_inactive_ratio(void) · line 5008
Quoted 8 lines
mm/page_alloc.c +1
-1@@ -5002,7 +5002,7 @@ static void __init setup_per_zone_inactive_ratio(void)* 8192MB: 11584k * 16384MB: 16384k */ -static int __init init_per_zone_wmark_min (void ) +int __meminit init_per_zone_wmark_min (void ) {unsigned long lowmem_kbytes;
setup_per_zone_inactive_ratio()should be moved from__initto__meminit, right?
Right. You are pointing out very old issue. I don't know why old code worked. but we certainly need to fix it. Thank you.
I'll prepare another incremental patch because this is another issue. Thanks.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>