It seems that we have some users out there that want to expose all
hotpluggable memory to userspace, so this implements a toggling mechanism
for those users who want to disable it.
By default, vmemmap pages mechanism is enabled.
Signed-off-by: Oscar Salvador <osalvador@xxxxxxx>
---
drivers/base/memory.c | 33 +++++++++++++++++++++++++++++++++
include/linux/memory_hotplug.h | 3 +++
mm/memory_hotplug.c | 6 +++++-
3 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index e0ac9a3b66f8..6fca2c96cc08 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -573,6 +573,35 @@ static DEVICE_ATTR_WO(soft_offline_page);
static DEVICE_ATTR_WO(hard_offline_page);
#endif
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+static ssize_t vmemmap_hotplug_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ if (vmemmap_enabled)
+ return sprintf(buf, "enabled\n");
+ else
+ return sprintf(buf, "disabled\n");
+}
+
+static ssize_t vmemmap_hotplug_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ if (!capable(CAP_SYS_ADMIN))
+ return -EPERM;
+
+ if (sysfs_streq(buf, "enable"))
+ vmemmap_enabled = true;
+ else if (sysfs_streq(buf, "disable"))
+ vmemmap_enabled = false;
+ else
+ return -EINVAL;
+
+ return count;
+}
+static DEVICE_ATTR_RW(vmemmap_hotplug);
+#endif
+
/*
* Note that phys_device is optional. It is here to allow for
* differentiation between which *physical* devices each
@@ -799,6 +828,10 @@ static struct attribute *memory_root_attrs[] = {
&dev_attr_hard_offline_page.attr,
#endif
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+ &dev_attr_vmemmap_hotplug.attr,
+#endif
+
&dev_attr_block_size_bytes.attr,
&dev_attr_auto_online_blocks.attr,
NULL
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index e28e226c9a20..94b4adc1a0ba 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -131,6 +131,9 @@ extern int arch_add_memory(int nid, u64 start, u64 size,
struct mhp_restrictions *restrictions);
extern u64 max_mem_size;
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+extern bool vmemmap_enabled;
+#endif
extern bool memhp_auto_online;
/* If movable_node boot option specified */
extern bool movable_node_enabled;
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index b5106cb75795..32ee6fb7d3bf 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -70,6 +70,10 @@ void put_online_mems(void)
bool movable_node_enabled = false;
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+bool vmemmap_enabled __read_mostly = true;
+#endif
+
#ifndef CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
bool memhp_auto_online;
#else
@@ -1168,7 +1172,7 @@ int __ref add_memory_resource(int nid, struct resource *res, unsigned long flags
goto error;
new_node = ret;
- if (mhp_check_correct_flags(flags))
+ if (vmemmap_enabled && mhp_check_correct_flags(flags))
restrictions.flags = flags;
/* call arch's memory hotadd */
--
2.12.3
