Subject: + memory_hotplug-use-pgdat_resize_lock-in-__offline_pages.patch added to -mm tree To: cody@xxxxxxxxxxxxxxxxxx,rientjes@xxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 03 Jul 2013 14:29:07 -0700 The patch titled Subject: memory_hotplug: use pgdat_resize_lock() in __offline_pages() has been added to the -mm tree. Its filename is memory_hotplug-use-pgdat_resize_lock-in-__offline_pages.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/memory_hotplug-use-pgdat_resize_lock-in-__offline_pages.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/memory_hotplug-use-pgdat_resize_lock-in-__offline_pages.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Cody P Schafer <cody@xxxxxxxxxxxxxxxxxx> Subject: 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(). Signed-off-by: Cody P Schafer <cody@xxxxxxxxxxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory_hotplug.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN mm/memory_hotplug.c~memory_hotplug-use-pgdat_resize_lock-in-__offline_pages mm/memory_hotplug.c --- a/mm/memory_hotplug.c~memory_hotplug-use-pgdat_resize_lock-in-__offline_pages +++ a/mm/memory_hotplug.c @@ -1585,7 +1585,11 @@ repeat: /* 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(); _ Patches currently in -mm which might be from cody@xxxxxxxxxxxxxxxxxx are mm-page_alloc-factor-out-setting-of-pcp-high-and-pcp-batch.patch mm-page_alloc-prevent-concurrent-updaters-of-pcp-batch-and-high.patch mm-page_alloc-insert-memory-barriers-to-allow-async-update-of-pcp-batch-and-high.patch mm-page_alloc-protect-pcp-batch-accesses-with-access_once.patch mm-page_alloc-convert-zone_pcp_update-to-rely-on-memory-barriers-instead-of-stop_machine.patch mm-page_alloc-when-handling-percpu_pagelist_fraction-dont-unneedly-recalulate-high.patch mm-page_alloc-factor-setup_pageset-into-pageset_init-and-pageset_set_batch.patch mm-page_alloc-relocate-comment-to-be-directly-above-code-it-refers-to.patch mm-page_alloc-factor-zone_pageset_init-out-of-setup_zone_pageset.patch mm-page_alloc-in-zone_pcp_update-uze-zone_pageset_init.patch mm-page_alloc-rename-setup_pagelist_highmark-to-match-naming-of-pageset_set_batch.patch mm-page_alloc-dont-re-init-pageset-in-zone_pcp_update.patch mm-fix-comment-referring-to-non-existent-size_seqlock-change-to-span_seqlock.patch mmzone-note-that-node_size_lock-should-be-manipulated-via-pgdat_resize_lock.patch memory_hotplug-use-pgdat_resize_lock-in-online_pages.patch memory_hotplug-use-pgdat_resize_lock-in-__offline_pages.patch memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix.patch sparsemem-add-build_bug_on-when-sizeof-mem_section-is-non-power-of-2.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html