From: Wen Congyang <[email protected]> This patch introduces a new function try_offline_node() to remove sysfs file of node when all memory sections of this node are removed. If some memory sections of this node are not removed, this function does nothing.
CC: David Rientjes <[email protected]> CC: Jiang Liu <[email protected]> CC: Len Brown <[email protected]> CC: Benjamin Herrenschmidt <[email protected]> CC: Paul Mackerras <[email protected]> CC: Christoph Lameter <[email protected]> Cc: Minchan Kim <[email protected]> CC: Andrew Morton <[email protected]> CC: KOSAKI Motohiro <[email protected]> CC: Yasuaki Ishimatsu <[email protected]> Signed-off-by: Wen Congyang <[email protected]> --- mm/memory_hotplug.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 493298f..fb8af64 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1286,6 +1286,37 @@ int offline_memory(u64 start, u64 size) return 0; } +/* offline the node if all memory sections of this node are removed */ +static void try_offline_node(int nid) +{ + unsigned long start_pfn = NODE_DATA(nid)->node_start_pfn; + unsigned long end_pfn = start_pfn + NODE_DATA(nid)->node_spanned_pages; + unsigned long pfn; + + for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) { + unsigned long section_nr = pfn_to_section_nr(pfn); + + if (!present_section_nr(section_nr)) + continue; + + if (pfn_to_nid(pfn) != nid) + continue; + + /* + * some memory sections of this node are not removed, and we + * can't offline node now. + */ + return; + } + + /* + * all memory sections of this node are removed, we can offline this + * node now. + */ + node_set_offline(nid); + unregister_one_node(nid); +} + int __ref remove_memory(int nid, u64 start, u64 size) { int ret = 0; @@ -1306,6 +1337,8 @@ int __ref remove_memory(int nid, u64 start, u64 size) firmware_map_remove(start, start + size, "System RAM"); arch_remove_memory(start, size); + + try_offline_node(nid); out: unlock_memory_hotplug(); return ret; -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
