Skip to content

Commit

Permalink
mm,memory_hotplug: factor out adjusting present pages into adjust_pre…
Browse files Browse the repository at this point in the history
…sent_page_count()

Let's have a single place (inspired by adjust_managed_page_count())
where we adjust present pages.

In contrast to adjust_managed_page_count(), only memory onlining or
offlining is allowed to modify the number of present pages.

Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: David Hildenbrand <[email protected]>
Signed-off-by: Oscar Salvador <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Cc: Anshuman Khandual <[email protected]>
Cc: Pavel Tatashin <[email protected]>
Cc: Vlastimil Babka <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
davidhildenbrand authored and torvalds committed May 5, 2021
1 parent dd8e2f2 commit f990114
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions mm/memory_hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,16 @@ struct zone * zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,
return default_zone_for_pfn(nid, start_pfn, nr_pages);
}

static void adjust_present_page_count(struct zone *zone, long nr_pages)
{
unsigned long flags;

zone->present_pages += nr_pages;
pgdat_resize_lock(zone->zone_pgdat, &flags);
zone->zone_pgdat->node_present_pages += nr_pages;
pgdat_resize_unlock(zone->zone_pgdat, &flags);
}

int __ref online_pages(unsigned long pfn, unsigned long nr_pages,
int online_type, int nid)
{
Expand Down Expand Up @@ -884,11 +894,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages,
}

online_pages_range(pfn, nr_pages);
zone->present_pages += nr_pages;

pgdat_resize_lock(zone->zone_pgdat, &flags);
zone->zone_pgdat->node_present_pages += nr_pages;
pgdat_resize_unlock(zone->zone_pgdat, &flags);
adjust_present_page_count(zone, nr_pages);

node_states_set_node(nid, &arg);
if (need_zonelists_rebuild)
Expand Down Expand Up @@ -1706,11 +1712,7 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages)

/* removal success */
adjust_managed_page_count(pfn_to_page(start_pfn), -nr_pages);
zone->present_pages -= nr_pages;

pgdat_resize_lock(zone->zone_pgdat, &flags);
zone->zone_pgdat->node_present_pages -= nr_pages;
pgdat_resize_unlock(zone->zone_pgdat, &flags);
adjust_present_page_count(zone, -nr_pages);

init_per_zone_wmark_min();

Expand Down

0 comments on commit f990114

Please sign in to comment.