lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] Add support for memory hot-remove.

Browse Source 
This patch enables memory hot-remove on s390.

Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Gerald Schaefer
2008-08-01 16:39:16 +02:00
committed by Martin Schwidefsky
parent 519620cc3d
commit 7e9238fbc1
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/s390/Kconfig
View File

@@ -317,6 +317,9 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
def_bool y def_bool y
depends on SPARSEMEM depends on SPARSEMEM
config ARCH_ENABLE_MEMORY_HOTREMOVE
def_bool y
source "mm/Kconfig" source "mm/Kconfig"
comment "I/O subsystem configuration" comment "I/O subsystem configuration"

13
arch/s390/mm/init.c
View File

@@ -179,7 +179,7 @@ int arch_add_memory(int nid, u64 start, u64 size)
int rc; int rc;
pgdat = NODE_DATA(nid); pgdat = NODE_DATA(nid);
zone = pgdat->node_zones + ZONE_NORMAL; zone = pgdat->node_zones + ZONE_MOVABLE;
rc = vmem_add_mapping(start, size); rc = vmem_add_mapping(start, size);
if (rc) if (rc)
return rc; return rc;
@@ -189,3 +189,14 @@ int arch_add_memory(int nid, u64 start, u64 size)
return rc; return rc;
} }
#endif /* CONFIG_MEMORY_HOTPLUG */ #endif /* CONFIG_MEMORY_HOTPLUG */
#ifdef CONFIG_MEMORY_HOTREMOVE
int remove_memory(u64 start, u64 size)
{
unsigned long start_pfn, end_pfn;
start_pfn = PFN_DOWN(start);
end_pfn = start_pfn + PFN_DOWN(size);
return offline_pages(start_pfn, end_pfn, 120 * HZ);
}
#endif /* CONFIG_MEMORY_HOTREMOVE */

5
drivers/s390/char/sclp_cmd.c
View File

@@ -427,6 +427,8 @@ static int sclp_mem_notifier(struct notifier_block *nb,
sclp_attach_storage(id); sclp_attach_storage(id);
switch (action) { switch (action) {
case MEM_ONLINE: case MEM_ONLINE:
case MEM_GOING_OFFLINE:
case MEM_CANCEL_OFFLINE:
break; break;
case MEM_GOING_ONLINE: case MEM_GOING_ONLINE:
rc = sclp_mem_change_state(start, size, 1); rc = sclp_mem_change_state(start, size, 1);
@@ -434,6 +436,9 @@ static int sclp_mem_notifier(struct notifier_block *nb,
case MEM_CANCEL_ONLINE: case MEM_CANCEL_ONLINE:
sclp_mem_change_state(start, size, 0); sclp_mem_change_state(start, size, 0);
break; break;
case MEM_OFFLINE:
sclp_mem_change_state(start, size, 0);
break;
default: default:
rc = -EINVAL; rc = -EINVAL;
break; break;