Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit d702909f0aa14fe678d74d7f974aa66bfb211d0b

Authored by Cody P Schafer
Committed by Linus Torvalds
1 parent aa47228a18
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

memory_hotplug: use pgdat_resize_lock() in __offline_pages() 

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().

[akpm@linux-foundation.org: fix build]
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 5 additions and 0 deletions Side-by-side Diff

... ... @@ -1492,6 +1492,7 @@
1492 1492 unsigned long pfn, nr_pages, expire;
1493 1493 long offlined_pages;
1494 1494 int ret, drain, retry_max, node;
  1495 + unsigned long flags;
1495 1496 struct zone *zone;
1496 1497 struct memory_notify arg;
1497 1498  
1498 1499  
... ... @@ -1585,7 +1586,11 @@
1585 1586 /* removal success */
1586 1587 zone->managed_pages -= offlined_pages;
1587 1588 zone->present_pages -= offlined_pages;
  1589 +
  1590 + pgdat_resize_lock(zone->zone_pgdat, &flags);
1588 1591 zone->zone_pgdat->node_present_pages -= offlined_pages;
  1592 + pgdat_resize_unlock(zone->zone_pgdat, &flags);
  1593 +
1589 1594 totalram_pages -= offlined_pages;
1590 1595  
1591 1596 init_per_zone_wmark_min();