mm: Remove duplicated call of get_pfn_range_for_nid
Subsystems (2)
When calculating pages in a node,
for each zone in that node, we will have
zone_spanned_pages_in_node
--> get_pfn_range_for_nid
zone_absent_pages_in_node
--> get_pfn_range_for_nidThat is to say, we call the get_pfn_range_for_nid to get start_pfn and end_pfn of the node for MAX_NR_ZONES * 2 times. And this is totally unnecessary if we call the get_pfn_range_for_nid before zone_*_pages_in_node add two extra arguments node_start_pfn and node_end_pfn for zone_*_pages_in_node, then we can remove the get_pfn_range_in_node in zone_*_pages_in_node.
Signed-off-by Zhang Yanfei <[email protected]>
--- mm/page_alloc.c | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-)
mm/page_alloc.c +29 -11
@@ -4366,13 +4366,13 @@ static void __meminit adjust_zone_range_for_zone_movable(int nid,*/ static unsigned long __meminit zone_spanned_pages_in_node (int nid,unsigned long zone_type, +unsigned long node_start_pfn, +unsigned long node_end_pfn,unsigned long *ignored) { -unsigned long node_start_pfn, node_end_pfn;unsigned long zone_start_pfn, zone_end_pfn; -/* Get the start and end of the node and zone */ -get_pfn_range_for_nid (nid, &node_start_pfn, &node_end_pfn); +/* Get the start and end of the zone */ zone_start_pfn = arch_zone_lowest_possible_pfn[zone_type]; zone_end_pfn = arch_zone_highest_possible_pfn[zone_type]; adjust_zone_range_for_zone_movable(nid, zone_type,
@@ -4427,14 +4427,14 @@ unsigned long __init absent_pages_in_range(unsigned long start_pfn,/* Return the number of page frames in holes in a zone on a node */ static unsigned long __meminit zone_absent_pages_in_node (int nid,unsigned long zone_type, +unsigned long node_start_pfn, +unsigned long node_end_pfn,unsigned long *ignored) {unsigned long zone_low = arch_zone_lowest_possible_pfn[zone_type];unsigned long zone_high = arch_zone_highest_possible_pfn[zone_type]; -unsigned long node_start_pfn, node_end_pfn;unsigned long zone_start_pfn, zone_end_pfn; -get_pfn_range_for_nid (nid, &node_start_pfn, &node_end_pfn); zone_start_pfn =clamp (node_start_pfn, zone_low, zone_high); zone_end_pfn =clamp (node_end_pfn, zone_low, zone_high);
@@ -4447,6 +4447,8 @@ static unsigned long __meminit zone_absent_pages_in_node(int nid,#else /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ static inline unsigned long __meminit zone_spanned_pages_in_node (int nid,unsigned long zone_type, +unsigned long node_start_pfn, +unsigned long node_end_pfn,unsigned long *zones_size) {return zones_size[zone_type];
@@ -4454,6 +4456,8 @@ static inline unsigned long __meminit zone_spanned_pages_in_node(int nid,static inline unsigned long __meminit zone_absent_pages_in_node (int nid,unsigned long zone_type, +unsigned long node_start_pfn, +unsigned long node_end_pfn,unsigned long *zholes_size) {if (!zholes_size)
@@ -4465,21 +4469,27 @@ static inline unsigned long __meminit zone_absent_pages_in_node(int nid,#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ static void __meminit calculate_node_totalpages (struct pglist_data *pgdat, -unsigned long *zones_size,unsigned long *zholes_size) +unsigned long node_start_pfn, +unsigned long node_end_pfn, +unsigned long *zones_size, +unsigned long *zholes_size) {unsigned long realtotalpages, totalpages =0 ;enum zone_type i;for (i =0 ; i <MAX_NR_ZONES ; i++) totalpages +=zone_spanned_pages_in_node (pgdat->node_id, i, - zones_size); + node_start_pfn, + node_end_pfn, + zones_size); pgdat->node_spanned_pages = totalpages; realtotalpages = totalpages;for (i =0 ; i <MAX_NR_ZONES ; i++) realtotalpages -=zone_absent_pages_in_node (pgdat->node_id, i, - zholes_size); + node_start_pfn, node_end_pfn, + zholes_size); pgdat->node_present_pages = realtotalpages;printk (KERN_DEBUG "On node %d totalpages: %lu\n" , pgdat->node_id, realtotalpages);
@@ -4588,6 +4598,7 @@ static unsigned long __paginginit calc_memmap_size(unsigned long spanned_pages,* NOTE: pgdat should get zeroed by caller. */ static void __paginginit free_area_init_core(struct pglist_data *pgdat, +unsigned long node_start_pfn,unsigned long node_end_pfn,unsigned long *zones_size,unsigned long *zholes_size) {enum zone_type j;
@@ -4609,8 +4620,11 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,struct zone *zone = pgdat->node_zones + j;unsigned long size, realsize, freesize, memmap_pages; - size =zone_spanned_pages_in_node (nid, j, zones_size); + size =zone_spanned_pages_in_node (nid, j, node_start_pfn, + node_end_pfn, zones_size); realsize = freesize = size -zone_absent_pages_in_node (nid, j, + node_start_pfn, + node_end_pfn, zholes_size);/*
@@ -4724,6 +4738,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, unsigned long node_start_pfn, unsigned long *zholes_size) { pg_data_t *pgdat = NODE_DATA(nid); +unsigned long start_pfn, end_pfn;/* pg_data_t should be reset to zero when it's allocated */ WARN_ON (pgdat->nr_zones || pgdat->classzone_idx);
@@ -4731,7 +4746,9 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, pgdat->node_id = nid; pgdat->node_start_pfn = node_start_pfn;init_zone_allows_reclaim (nid); -calculate_node_totalpages (pgdat, zones_size, zholes_size); +get_pfn_range_for_nid (nid, &start_pfn, &end_pfn); +calculate_node_totalpages (pgdat, start_pfn, end_pfn, + zones_size, zholes_size);alloc_node_mem_map (pgdat);#ifdef CONFIG_FLAT_NODE_MEM_MAP
@@ -4740,7 +4757,8 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, (unsigned long)pgdat->node_mem_map);#endif -free_area_init_core (pgdat, zones_size, zholes_size); +free_area_init_core (pgdat, start_pfn, end_pfn, + zones_size, zholes_size); }#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
Signature · 1 line
1.7.1