[074/158] mm/hotplug: reorder memblock_[free|remove]() calls in try_remove_memory()

Commit Message

Andrew Morton Dec. 1, 2019, 1:53 a.m. UTC

From: Anshuman Khandual <[e-mail]>
Subject: mm/hotplug: reorder memblock_[free|remove]() calls in try_remove_memory()

Currently during memory hot add procedure, memory gets into memblock
before calling arch_add_memory() which creates its linear mapping.

add_memory_resource() {
	..................
	memblock_add_node()
	..................
	arch_add_memory()
	..................
}

But during memory hot remove procedure, removal from memblock happens
first before its linear mapping gets teared down with arch_remove_memory()
which is not consistent.  Resource removal should happen in reverse order
as they were added.  However this does not pose any problem for now,
unless there is an assumption regarding linear mapping.  One example was a
subtle failure on arm64 platform [1].  Though this has now found a
different solution.

try_remove_memory() {
	..................
	memblock_free()
	memblock_remove()
	..................
	arch_remove_memory()
	..................
}

This changes the sequence of resource removal including memblock and
linear mapping tear down during memory hot remove which will now be the
reverse order in which they were added during memory hot add.  The changed
removal order looks like the following.

try_remove_memory() {
	..................
	arch_remove_memory()
	..................
	memblock_free()
	memblock_remove()
	..................
}

[1] https://patchwork.kernel.org/patch/11127623/

Memory hot remove now works on arm64 without this because a recent commit
60bb462fc7ad ("drivers/base/node.c: simplify
unregister_memory_block_under_nodes()").

This does not fix a serious problem.  It just removes an inconsistency
while freeing resources during memory hot remove which for now does not
pose a real problem.

David mentioned that re-ordering should still make sense for consistency
purpose (removing stuff in the reverse order they were added).  This patch
is now detached from arm64 hot-remove series.

Michal:

: I would just a note that the inconsistency doesn't pose any problem now
: but if somebody makes any assumptions about linear mappings then it could
: get subtly broken like your example for arm64 which has found a different
: solution in the meantime.

Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Anshuman Khandual <[e-mail]>
Acked-by: Michal Hocko <[e-mail]>
Reviewed-by: David Hildenbrand <[e-mail]>
Cc: Oscar Salvador <[e-mail]>
Cc: Pavel Tatashin <[e-mail]>
Cc: Dan Williams <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/memory_hotplug.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

--- a/mm/memory_hotplug.c~mm-hotplug-reorder-memblock_-calls-in-try_remove_memory
+++ a/mm/memory_hotplug.c
@@ -1750,13 +1750,13 @@  static int __ref try_remove_memory(int n
 
 	/* remove memmap entry */
 	firmware_map_remove(start, start + size, "System RAM");
-	memblock_free(start, size);
-	memblock_remove(start, size);
 
 	/* remove memory block devices before removing memory */
 	remove_memory_block_devices(start, size);
 
 	arch_remove_memory(nid, start, size, NULL);
+	memblock_free(start, size);
+	memblock_remove(start, size);
 	__release_memory_resource(start, size);
 
 	try_offline_node(nid);