openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mm/memory_hotplug: convert memhp_auto_online to store an online_type 

...  and rename it to memhp_default_online_type.  This is a preparation
for more detailed default online behavior.

Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: Baoquan He <bhe@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Wei Liu <wei.liu@kernel.org>
Cc: Yumei Huang <yuhuang@redhat.com>
Link: http://lkml.kernel.org/r/20200317104942.11178-8-david@redhat.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Hildenbrand 2020-04-06 20:07:40 -07:00 committed by Linus Torvalds
parent 5a04af1322
commit 862919e568
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/base/memory.c
View File

@ -378,10 +378,8 @@ static DEVICE_ATTR_RO(block_size_bytes);
static ssize_t auto_online_blocks_show(struct device *dev, static ssize_t auto_online_blocks_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
if (memhp_auto_online) return sprintf(buf, "%s\n",
return sprintf(buf, "online\n"); online_type_to_str[memhp_default_online_type]);
else
return sprintf(buf, "offline\n");
} }
static ssize_t auto_online_blocks_store(struct device *dev, static ssize_t auto_online_blocks_store(struct device *dev,
@ -389,9 +387,9 @@ static ssize_t auto_online_blocks_store(struct device *dev,
const char *buf, size_t count) const char *buf, size_t count)
{ {
if (sysfs_streq(buf, "online")) if (sysfs_streq(buf, "online"))
memhp_auto_online = true; memhp_default_online_type = MMOP_ONLINE;
else if (sysfs_streq(buf, "offline")) else if (sysfs_streq(buf, "offline"))
memhp_auto_online = false; memhp_default_online_type = MMOP_OFFLINE;
else else
return -EINVAL; return -EINVAL;

3
include/linux/memory_hotplug.h
View File

@ -117,7 +117,8 @@ extern int arch_add_memory(int nid, u64 start, u64 size,
struct mhp_restrictions *restrictions); struct mhp_restrictions *restrictions);
extern u64 max_mem_size; extern u64 max_mem_size;
extern bool memhp_auto_online; /* Default online_type (MMOP_*) when new memory blocks are added. */
extern int memhp_default_online_type;
/* If movable_node boot option specified */ /* If movable_node boot option specified */
extern bool movable_node_enabled; extern bool movable_node_enabled;
static inline bool movable_node_is_enabled(void) static inline bool movable_node_is_enabled(void)

11
mm/memory_hotplug.c
View File

@ -67,17 +67,17 @@ void put_online_mems(void)
bool movable_node_enabled = false; bool movable_node_enabled = false;
#ifndef CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE #ifndef CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
bool memhp_auto_online; int memhp_default_online_type = MMOP_OFFLINE;
#else #else
bool memhp_auto_online = true; int memhp_default_online_type = MMOP_ONLINE;
#endif #endif
static int __init setup_memhp_default_state(char *str) static int __init setup_memhp_default_state(char *str)
{ {
if (!strcmp(str, "online")) if (!strcmp(str, "online"))
memhp_auto_online = true; memhp_default_online_type = MMOP_ONLINE;
else if (!strcmp(str, "offline")) else if (!strcmp(str, "offline"))
memhp_auto_online = false; memhp_default_online_type = MMOP_OFFLINE;
return 1; return 1;
} }
@ -990,6 +990,7 @@ static int check_hotplug_memory_range(u64 start, u64 size)
static int online_memory_block(struct memory_block *mem, void *arg) static int online_memory_block(struct memory_block *mem, void *arg)
{ {
mem->online_type = memhp_default_online_type;
return device_online(&mem->dev); return device_online(&mem->dev);
} }
@ -1062,7 +1063,7 @@ int __ref add_memory_resource(int nid, struct resource *res)
mem_hotplug_done(); mem_hotplug_done();
/* online pages if requested */ /* online pages if requested */
if (memhp_auto_online) if (memhp_default_online_type != MMOP_OFFLINE)
walk_memory_blocks(start, size, NULL, online_memory_block); walk_memory_blocks(start, size, NULL, online_memory_block);
return ret; return ret;