p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mm/zsmalloc: Convert to hotplug state machine 

Install the callbacks via the state machine and let the core invoke
the callbacks on the already online CPUs.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: linux-mm@kvack.org
Cc: Minchan Kim <minchan@kernel.org>
Cc: rt@linutronix.de
Cc: Nitin Gupta <ngupta@vflare.org>
Link: http://lkml.kernel.org/r/20161126231350.10321-11-bigeasy@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Sebastian Andrzej Siewior 2016-11-27 00:13:38 +01:00 committed by Thomas Gleixner
parent 5438da977f
commit 215c89d055
2 changed files with 14 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/cpuhotplug.h
View File

@ -64,6 +64,7 @@ enum cpuhp_state {
CPUHP_NET_IUCV_PREPARE, CPUHP_NET_IUCV_PREPARE,
CPUHP_ARM_BL_PREPARE, CPUHP_ARM_BL_PREPARE,
CPUHP_TRACE_RB_PREPARE, CPUHP_TRACE_RB_PREPARE,
CPUHP_MM_ZS_PREPARE,
CPUHP_TIMERS_DEAD, CPUHP_TIMERS_DEAD,
CPUHP_NOTF_ERR_INJ_PREPARE, CPUHP_NOTF_ERR_INJ_PREPARE,
CPUHP_MIPS_SOC_PREPARE, CPUHP_MIPS_SOC_PREPARE,

69
mm/zsmalloc.c
View File

@ -1284,61 +1284,21 @@ static void __zs_unmap_object(struct mapping_area *area,
#endif /* CONFIG_PGTABLE_MAPPING */ #endif /* CONFIG_PGTABLE_MAPPING */
static int zs_cpu_notifier(struct notifier_block *nb, unsigned long action, static int zs_cpu_prepare(unsigned int cpu)
void *pcpu)
{ {
int ret, cpu = (long)pcpu;
struct mapping_area *area; struct mapping_area *area;
switch (action) {
case CPU_UP_PREPARE:
area = &per_cpu(zs_map_area, cpu); area = &per_cpu(zs_map_area, cpu);
ret = __zs_cpu_up(area); return __zs_cpu_up(area);
if (ret) }
return notifier_from_errno(ret);
break; static int zs_cpu_dead(unsigned int cpu)
case CPU_DEAD: {
case CPU_UP_CANCELED: struct mapping_area *area;
area = &per_cpu(zs_map_area, cpu); area = &per_cpu(zs_map_area, cpu);
__zs_cpu_down(area); __zs_cpu_down(area);
break; return 0;
}
return NOTIFY_OK;
}
static struct notifier_block zs_cpu_nb = {
.notifier_call = zs_cpu_notifier
};
static int zs_register_cpu_notifier(void)
{
int cpu, uninitialized_var(ret);
cpu_notifier_register_begin();
__register_cpu_notifier(&zs_cpu_nb);
for_each_online_cpu(cpu) {
ret = zs_cpu_notifier(NULL, CPU_UP_PREPARE, (void *)(long)cpu);
if (notifier_to_errno(ret))
break;
}
cpu_notifier_register_done();
return notifier_to_errno(ret);
}
static void zs_unregister_cpu_notifier(void)
{
int cpu;
cpu_notifier_register_begin();
for_each_online_cpu(cpu)
zs_cpu_notifier(NULL, CPU_DEAD, (void *)(long)cpu);
__unregister_cpu_notifier(&zs_cpu_nb);
cpu_notifier_register_done();
} }
static void __init init_zs_size_classes(void) static void __init init_zs_size_classes(void)
@ -2534,10 +2494,10 @@ static int __init zs_init(void)
if (ret) if (ret)
goto out; goto out;
ret = zs_register_cpu_notifier(); ret = cpuhp_setup_state(CPUHP_MM_ZS_PREPARE, "mm/zsmalloc:prepare",
zs_cpu_prepare, zs_cpu_dead);
if (ret) if (ret)
goto notifier_fail; goto hp_setup_fail;
init_zs_size_classes(); init_zs_size_classes();
@ -2549,8 +2509,7 @@ static int __init zs_init(void)
return 0; return 0;
notifier_fail: hp_setup_fail:
zs_unregister_cpu_notifier();
zsmalloc_unmount(); zsmalloc_unmount();
out: out:
return ret; return ret;
@ -2562,7 +2521,7 @@ static void __exit zs_exit(void)
zpool_unregister_driver(&zs_zpool_driver); zpool_unregister_driver(&zs_zpool_driver);
#endif #endif
zsmalloc_unmount(); zsmalloc_unmount();
zs_unregister_cpu_notifier(); cpuhp_remove_state(CPUHP_MM_ZS_PREPARE);
zs_stat_exit(); zs_stat_exit();
} }