The current machinery for hot-adding memory requires having user level to bring the memory segments online. Export the necessary functionality to bring the memory segment online without involving user space code. Signed-off-by: K. Y. Srinivasan <kys@xxxxxxxxxxxxx> --- drivers/base/memory.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/memory.h | 5 +++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 2b7813e..a7140b3 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -541,6 +541,41 @@ struct memory_block *find_memory_block(struct mem_section *section) return find_memory_block_hinted(section, NULL); } +/* + * Given the start pfn of a memory block; bring the memory + * block online. This API would be useful for drivers that may + * want to bring "online" the memory that has been hot-added. + */ + +int online_memory_block(unsigned long start_pfn) +{ + struct mem_section *cur_section; + struct memory_block *cur_memory_block; + int ret_val = -EINVAL; + + cur_section = __pfn_to_section(start_pfn); + + if (!valid_section(cur_section)) + return ret_val; + + mutex_lock(&mem_sysfs_mutex); + cur_memory_block = find_memory_block(cur_section); + + if (!cur_memory_block) { + mutex_unlock(&mem_sysfs_mutex); + return ret_val; + } + + lock_device_hotplug(); + ret_val = memory_block_change_state(cur_memory_block, MEM_ONLINE, + MEM_OFFLINE, ONLINE_KEEP); + unlock_device_hotplug(); + mutex_unlock(&mem_sysfs_mutex); + + return ret_val; +} +EXPORT_SYMBOL_GPL(online_memory_block); + static struct attribute *memory_memblk_attrs[] = { &dev_attr_phys_index.attr, &dev_attr_end_phys_index.attr, diff --git a/include/linux/memory.h b/include/linux/memory.h index 85c31a8..7d0d2a6 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -109,12 +109,17 @@ static inline int memory_isolate_notify(unsigned long val, void *v) { return 0; } +static inline int online_memory_block(unsigned long start_pfn) +{ + return 0; +} #else extern int register_memory_notifier(struct notifier_block *nb); 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); extern int register_new_memory(int, struct mem_section *); +extern int online_memory_block(unsigned long start_pfn); #ifdef CONFIG_MEMORY_HOTREMOVE extern int unregister_memory_section(struct mem_section *); #endif -- 1.7.4.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>