Commit 4c4b7f9b authored by David Hildenbrand's avatar David Hildenbrand Committed by Linus Torvalds
Browse files

mm/memory_hotplug: remove memory block devices before arch_remove_memory()

Let's factor out removing of memory block devices, which is only
necessary for memory added via add_memory() and friends that created
memory block devices.  Remove the devices before calling

This finishes factoring out memory block device handling from
arch_add_memory() and arch_remove_memory().


Signed-off-by: default avatarDavid Hildenbrand <>
Reviewed-by: default avatarDan Williams <>
Acked-by: default avatarMichal Hocko <>
Cc: Greg Kroah-Hartman <>
Cc: "Rafael J. Wysocki" <>
Cc: David Hildenbrand <>
Cc: "" <>
Cc: Andrew Banman <>
Cc: Ingo Molnar <>
Cc: Alex Deucher <>
Cc: "David S. Miller" <>
Cc: Mark Brown <>
Cc: Chris Wilson <>
Cc: Oscar Salvador <>
Cc: Jonathan Cameron <>
Cc: Arun KS <>
Cc: Mathieu Malaterre <>
Cc: Andy Lutomirski <>
Cc: Anshuman Khandual <>
Cc: Ard Biesheuvel <>
Cc: Baoquan He <>
Cc: Benjamin Herrenschmidt <>
Cc: Borislav Petkov <>
Cc: Catalin Marinas <>
Cc: Chintan Pandya <>
Cc: Christophe Leroy <>
Cc: Dave Hansen <>
Cc: Fenghua Yu <>
Cc: Heiko Carstens <>
Cc: "H. Peter Anvin" <>
Cc: Joonsoo Kim <>
Cc: Jun Yao <>
Cc: "Kirill A. Shutemov" <>
Cc: Logan Gunthorpe <>
Cc: Mark Rutland <>
Cc: Masahiro Yamada <>
Cc: Michael Ellerman <>
Cc: Mike Rapoport <>
Cc: Nicholas Piggin <>
Cc: Oscar Salvador <>
Cc: Paul Mackerras <>
Cc: Pavel Tatashin <>
Cc: Peter Zijlstra <>
Cc: Qian Cai <>
Cc: Rich Felker <>
Cc: Rob Herring <>
Cc: Robin Murphy <>
Cc: Thomas Gleixner <>
Cc: Tony Luck <>
Cc: Vasily Gorbik <>
Cc: Wei Yang <>
Cc: Will Deacon <>
Cc: Yoshinori Sato <>
Cc: Yu Zhao <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 05f800a0
......@@ -759,32 +759,31 @@ int create_memory_block_devices(unsigned long start, unsigned long size)
return ret;
void unregister_memory_section(struct mem_section *section)
* Remove memory block devices for the given memory area. Start and size
* have to be aligned to memory block granularity. Memory block devices
* have to be offline.
void remove_memory_block_devices(unsigned long start, unsigned long size)
const int start_block_id = pfn_to_block_id(PFN_DOWN(start));
const int end_block_id = pfn_to_block_id(PFN_DOWN(start + size));
struct memory_block *mem;
int block_id;
if (WARN_ON_ONCE(!present_section(section)))
if (WARN_ON_ONCE(!IS_ALIGNED(start, memory_block_size_bytes()) ||
!IS_ALIGNED(size, memory_block_size_bytes())))
* Some users of the memory hotplug do not want/need memblock to
* track all sections. Skip over those.
mem = find_memory_block(section);
if (!mem)
goto out_unlock;
unregister_mem_sect_under_nodes(mem, __section_nr(section));
if (mem->section_count == 0)
for (block_id = start_block_id; block_id != end_block_id; block_id++) {
mem = find_memory_block_by_id(block_id, NULL);
if (WARN_ON_ONCE(!mem))
mem->section_count = 0;
......@@ -802,9 +802,10 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg)
return 0;
/* unregister memory section under all nodes that it spans */
int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,
unsigned long phys_index)
* Unregister memory block device under all nodes that it spans.
int unregister_memory_block_under_nodes(struct memory_block *mem_blk)
NODEMASK_ALLOC(nodemask_t, unlinked_nodes, GFP_KERNEL);
unsigned long pfn, sect_start_pfn, sect_end_pfn;
......@@ -817,8 +818,8 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,
return -ENOMEM;
sect_start_pfn = section_nr_to_pfn(phys_index);
sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1;
sect_start_pfn = section_nr_to_pfn(mem_blk->start_section_nr);
sect_end_pfn = section_nr_to_pfn(mem_blk->end_section_nr);
for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {
int nid;
......@@ -112,7 +112,7 @@ extern void unregister_memory_notifier(struct notifier_block *nb);
extern int register_memory_isolate_notifier(struct notifier_block *nb);
extern void unregister_memory_isolate_notifier(struct notifier_block *nb);
int create_memory_block_devices(unsigned long start, unsigned long size);
extern void unregister_memory_section(struct mem_section *);
void remove_memory_block_devices(unsigned long start, unsigned long size);
extern int memory_dev_init(void);
extern int memory_notify(unsigned long val, void *v);
extern int memory_isolate_notify(unsigned long val, void *v);
......@@ -139,8 +139,7 @@ extern int register_cpu_under_node(unsigned int cpu, unsigned int nid);
extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);
extern int register_mem_sect_under_node(struct memory_block *mem_blk,
void *arg);
extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,
unsigned long phys_index);
extern int unregister_memory_block_under_nodes(struct memory_block *mem_blk);
extern int register_memory_node_under_compute_node(unsigned int mem_nid,
unsigned int cpu_nid,
......@@ -176,8 +175,7 @@ static inline int register_mem_sect_under_node(struct memory_block *mem_blk,
return 0;
static inline int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,
unsigned long phys_index)
static inline int unregister_memory_block_under_nodes(struct memory_block *mem_blk)
return 0;
......@@ -520,8 +520,6 @@ static void __remove_section(struct zone *zone, struct mem_section *ms,
if (WARN_ON_ONCE(!valid_section(ms)))
scn_nr = __section_nr(ms);
start_pfn = section_nr_to_pfn((unsigned long)scn_nr);
__remove_zone(zone, start_pfn);
......@@ -1834,6 +1832,9 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)
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);
__release_memory_resource(start, size);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment