Skip to content

Commit

Permalink
memory_hotplug: use pgdat_resize_lock() in __offline_pages()
Browse files Browse the repository at this point in the history
mmzone.h documents node_size_lock (which pgdat_resize_lock() locks) as
follows:

        * Must be held any time you expect node_start_pfn, node_present_pages
        * or node_spanned_pages stay constant.  [...]

So actually hold it when we update node_present_pages in __offline_pages().

[[email protected]: fix build]
Signed-off-by: Cody P Schafer <[email protected]>
Cc: David Rientjes <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
codyps authored and torvalds committed Jul 3, 2013
1 parent aa47228 commit d702909
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions mm/memory_hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -1492,6 +1492,7 @@ static int __ref __offline_pages(unsigned long start_pfn,
unsigned long pfn, nr_pages, expire;
long offlined_pages;
int ret, drain, retry_max, node;
unsigned long flags;
struct zone *zone;
struct memory_notify arg;

Expand Down Expand Up @@ -1585,7 +1586,11 @@ static int __ref __offline_pages(unsigned long start_pfn,
/* removal success */
zone->managed_pages -= offlined_pages;
zone->present_pages -= offlined_pages;

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

totalram_pages -= offlined_pages;

init_per_zone_wmark_min();
Expand Down

0 comments on commit d702909

Please sign in to comment.