From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> To: linux-kernel@vger.kernel.org Cc: rt@linutronix.de, tglx@linutronix.de, Sebastian Andrzej Siewior <bigeasy@linutronix.de>, Minchan Kim <minchan@kernel.org>, Nitin Gupta <ngupta@vflare.org>, Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>, linux-mm@kvack.org Subject: [PATCH 10/22] mm/zsmalloc: Convert to hotplug state machine Date: Sun, 27 Nov 2016 00:13:38 +0100 [thread overview] Message-ID: <20161126231350.10321-11-bigeasy@linutronix.de> (raw) In-Reply-To: <20161126231350.10321-1-bigeasy@linutronix.de> Install the callbacks via the state machine and let the core invoke the callbacks on the already online CPUs. Cc: Minchan Kim <minchan@kernel.org> Cc: Nitin Gupta <ngupta@vflare.org> Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> CC: linux-mm@kvack.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- include/linux/cpuhotplug.h | 1 + mm/zsmalloc.c | 67 +++++++++------------------------------------- 2 files changed, 14 insertions(+), 54 deletions(-) diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 4ebd1bc27f8d..9f29dd996088 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -64,6 +64,7 @@ enum cpuhp_state { CPUHP_NET_IUCV_PREPARE, CPUHP_ARM_BL_PREPARE, CPUHP_TRACE_RB_PREPARE, + CPUHP_MM_ZS_PREPARE, CPUHP_TIMERS_DEAD, CPUHP_NOTF_ERR_INJ_PREPARE, CPUHP_MIPS_SOC_PREPARE, diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index b0bc023d25c5..9cc3c0b2c2c1 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1284,61 +1284,21 @@ static void __zs_unmap_object(struct mapping_area *area, #endif /* CONFIG_PGTABLE_MAPPING */ -static int zs_cpu_notifier(struct notifier_block *nb, unsigned long action, - void *pcpu) +static int zs_cpu_prepare(unsigned int cpu) { - int ret, cpu = (long)pcpu; struct mapping_area *area; - switch (action) { - case CPU_UP_PREPARE: - area = &per_cpu(zs_map_area, cpu); - ret = __zs_cpu_up(area); - if (ret) - return notifier_from_errno(ret); - break; - case CPU_DEAD: - case CPU_UP_CANCELED: - area = &per_cpu(zs_map_area, cpu); - __zs_cpu_down(area); - break; - } - - return NOTIFY_OK; + area = &per_cpu(zs_map_area, cpu); + return __zs_cpu_up(area); } -static struct notifier_block zs_cpu_nb = { - .notifier_call = zs_cpu_notifier -}; - -static int zs_register_cpu_notifier(void) +static int zs_cpu_dead(unsigned int cpu) { - int cpu, uninitialized_var(ret); + struct mapping_area *area; - 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(); + area = &per_cpu(zs_map_area, cpu); + __zs_cpu_down(area); + return 0; } static void __init init_zs_size_classes(void) @@ -2534,10 +2494,10 @@ static int __init zs_init(void) if (ret) 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) - goto notifier_fail; + goto hp_setup_fail; init_zs_size_classes(); @@ -2549,8 +2509,7 @@ static int __init zs_init(void) return 0; -notifier_fail: - zs_unregister_cpu_notifier(); +hp_setup_fail: zsmalloc_unmount(); out: return ret; @@ -2562,7 +2521,7 @@ static void __exit zs_exit(void) zpool_unregister_driver(&zs_zpool_driver); #endif zsmalloc_unmount(); - zs_unregister_cpu_notifier(); + cpuhp_remove_state(CPUHP_MM_ZS_PREPARE); zs_stat_exit(); } -- 2.10.2
WARNING: multiple messages have this Message-ID (diff)
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> To: linux-kernel@vger.kernel.org Cc: rt@linutronix.de, tglx@linutronix.de, Sebastian Andrzej Siewior <bigeasy@linutronix.de>, Minchan Kim <minchan@kernel.org>, Nitin Gupta <ngupta@vflare.org>, Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>, linux-mm@kvack.org Subject: [PATCH 10/22] mm/zsmalloc: Convert to hotplug state machine Date: Sun, 27 Nov 2016 00:13:38 +0100 [thread overview] Message-ID: <20161126231350.10321-11-bigeasy@linutronix.de> (raw) In-Reply-To: <20161126231350.10321-1-bigeasy@linutronix.de> Install the callbacks via the state machine and let the core invoke the callbacks on the already online CPUs. Cc: Minchan Kim <minchan@kernel.org> Cc: Nitin Gupta <ngupta@vflare.org> Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> CC: linux-mm@kvack.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- include/linux/cpuhotplug.h | 1 + mm/zsmalloc.c | 67 +++++++++------------------------------------- 2 files changed, 14 insertions(+), 54 deletions(-) diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 4ebd1bc27f8d..9f29dd996088 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -64,6 +64,7 @@ enum cpuhp_state { CPUHP_NET_IUCV_PREPARE, CPUHP_ARM_BL_PREPARE, CPUHP_TRACE_RB_PREPARE, + CPUHP_MM_ZS_PREPARE, CPUHP_TIMERS_DEAD, CPUHP_NOTF_ERR_INJ_PREPARE, CPUHP_MIPS_SOC_PREPARE, diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index b0bc023d25c5..9cc3c0b2c2c1 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1284,61 +1284,21 @@ static void __zs_unmap_object(struct mapping_area *area, #endif /* CONFIG_PGTABLE_MAPPING */ -static int zs_cpu_notifier(struct notifier_block *nb, unsigned long action, - void *pcpu) +static int zs_cpu_prepare(unsigned int cpu) { - int ret, cpu = (long)pcpu; struct mapping_area *area; - switch (action) { - case CPU_UP_PREPARE: - area = &per_cpu(zs_map_area, cpu); - ret = __zs_cpu_up(area); - if (ret) - return notifier_from_errno(ret); - break; - case CPU_DEAD: - case CPU_UP_CANCELED: - area = &per_cpu(zs_map_area, cpu); - __zs_cpu_down(area); - break; - } - - return NOTIFY_OK; + area = &per_cpu(zs_map_area, cpu); + return __zs_cpu_up(area); } -static struct notifier_block zs_cpu_nb = { - .notifier_call = zs_cpu_notifier -}; - -static int zs_register_cpu_notifier(void) +static int zs_cpu_dead(unsigned int cpu) { - int cpu, uninitialized_var(ret); + struct mapping_area *area; - 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(); + area = &per_cpu(zs_map_area, cpu); + __zs_cpu_down(area); + return 0; } static void __init init_zs_size_classes(void) @@ -2534,10 +2494,10 @@ static int __init zs_init(void) if (ret) 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) - goto notifier_fail; + goto hp_setup_fail; init_zs_size_classes(); @@ -2549,8 +2509,7 @@ static int __init zs_init(void) return 0; -notifier_fail: - zs_unregister_cpu_notifier(); +hp_setup_fail: zsmalloc_unmount(); out: return ret; @@ -2562,7 +2521,7 @@ static void __exit zs_exit(void) zpool_unregister_driver(&zs_zpool_driver); #endif zsmalloc_unmount(); - zs_unregister_cpu_notifier(); + cpuhp_remove_state(CPUHP_MM_ZS_PREPARE); zs_stat_exit(); } -- 2.10.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-11-26 23:17 UTC|newest] Thread overview: 131+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-26 23:13 cpu hotplug: convert more drivers (batch #6 and last) Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 01/22] cpufreq/acpi-cpufreq: Convert to hotplug state machine Sebastian Andrzej Siewior 2016-11-28 5:15 ` Viresh Kumar 2016-11-28 9:49 ` Sebastian Andrzej Siewior 2016-11-28 9:51 ` [PATCH 01/22 v2] " Sebastian Andrzej Siewior 2016-11-28 9:54 ` Viresh Kumar 2016-11-28 12:46 ` Rafael J. Wysocki 2016-11-26 23:13 ` [PATCH 02/22] cpufreq/acpi-cpufreq: drop rdmsr_on_cpus() usage Sebastian Andrzej Siewior 2016-11-28 9:52 ` [PATCH 02/22 v2] " Sebastian Andrzej Siewior 2016-11-28 9:54 ` Viresh Kumar 2016-11-26 23:13 ` [PATCH 03/22] idle/intel: Remove superfluous SMP fuction call Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 04/22] idle/intel: Convert to hotplug state machine Sebastian Andrzej Siewior 2016-11-28 17:29 ` Thomas Gleixner 2016-11-29 9:40 ` Sebastian Andrzej Siewior 2016-11-29 9:51 ` [PATCH 04/22 v2] " Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 05/22] oprofile/nmi timer: " Sebastian Andrzej Siewior 2016-12-02 0:09 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 06/22] tracing/rb: " Sebastian Andrzej Siewior 2016-12-02 0:10 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-12-07 11:15 ` [linux-next] tracing/rb: NULL pointer dereference at trace_rb_cpu_prepare() Tetsuo Handa 2016-12-07 13:31 ` [PATCH] tracing/rb: init the CPU mask on allocation Sebastian Andrzej Siewior 2016-12-07 13:43 ` [tip:smp/hotplug] tracing/rb: Init " tip-bot for Sebastian Andrzej Siewior 2016-12-07 14:33 ` [PATCH] tracing/rb: init " Tetsuo Handa 2016-11-26 23:13 ` [PATCH 07/22] mm/vmstat: Drop get_online_cpus() from init_cpu_node_state/vmstat_cpu_dead() Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-11-28 9:24 ` Michal Hocko 2016-11-28 9:24 ` Michal Hocko 2016-12-02 0:10 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 08/22] mm/vmstat: Avoid on each online CPU loops Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-11-28 9:28 ` Michal Hocko 2016-11-28 9:28 ` Michal Hocko 2016-11-29 14:08 ` Thomas Gleixner 2016-11-29 14:08 ` Thomas Gleixner 2016-11-29 14:44 ` Michal Hocko 2016-11-29 14:44 ` Michal Hocko 2016-11-29 14:51 ` [PATCH 08/22 v2] " Sebastian Andrzej Siewior 2016-11-29 14:51 ` Sebastian Andrzej Siewior 2016-11-29 15:20 ` Michal Hocko 2016-11-29 15:20 ` Michal Hocko 2016-12-02 0:11 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 09/22] mm/vmstat: Convert to hotplug state machine Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-11-29 14:52 ` [PATCH 09/22 v2] " Sebastian Andrzej Siewior 2016-11-29 14:52 ` Sebastian Andrzej Siewior 2016-12-02 0:11 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior [this message] 2016-11-26 23:13 ` [PATCH 10/22] mm/zsmalloc: " Sebastian Andrzej Siewior 2016-12-02 0:12 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 11/22] mm/zswap: Convert dst-mem " Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-12-02 0:12 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 12/22] mm/zswap: Convert pool " Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-12-02 0:13 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 13/22] iommu/vt-d: Convert " Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-12-02 0:13 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner 2016-11-26 23:13 ` [PATCH 14/22] mm/compaction: " Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-12-02 0:14 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner 2016-11-26 23:13 ` [PATCH 15/22] arm64/cpuinfo: Make hotplug notifier symmetric Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-11-29 17:22 ` Suzuki K Poulose 2016-11-29 17:22 ` Suzuki K Poulose 2016-12-02 0:14 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner 2016-11-26 23:13 ` [PATCH 16/22] arm64/cpuinfo: Convert to hotplug state machine Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-11-29 17:26 ` Suzuki K Poulose 2016-11-29 17:26 ` Suzuki K Poulose 2016-12-02 0:15 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner 2016-11-26 23:13 ` [PATCH 17/22] KVM/PPC/Book3S HV: " Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-11-26 23:13 ` Sebastian Andrzej Siewior 2016-12-02 0:15 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner 2016-11-26 23:13 ` [PATCH 18/22] zram: " Sebastian Andrzej Siewior 2016-12-02 0:16 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner 2016-11-26 23:13 ` [PATCH 19/22] soc/fsl/qbman: " Sebastian Andrzej Siewior 2016-12-02 0:16 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 20/22] " Sebastian Andrzej Siewior 2016-12-02 0:17 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 21/22] staging/lustre/libcfs: " Sebastian Andrzej Siewior 2016-11-26 23:14 ` [lustre-devel] " Sebastian Andrzej Siewior 2016-12-02 10:18 ` [PATCH 21/22 v2] " Sebastian Andrzej Siewior 2016-12-02 10:18 ` [lustre-devel] " Sebastian Andrzej Siewior 2016-12-02 10:42 ` Greg Kroah-Hartman 2016-12-02 10:42 ` [lustre-devel] " Greg Kroah-Hartman 2016-12-02 11:00 ` [PATCH 21/22 v3] " Sebastian Andrzej Siewior 2016-12-02 11:00 ` [lustre-devel] " Sebastian Andrzej Siewior 2016-11-26 23:13 ` [PATCH 22/22] Remove obsolete cpu hotplug register / unregister functions Sebastian Andrzej Siewior 2016-12-21 19:19 [patch 00/10] cpu/hotplug: Final cleanup Thomas Gleixner 2016-12-21 19:19 ` [patch 01/10] ARM: imx: mmcd: Fix broken cpu hotplug handling Thomas Gleixner 2016-12-22 20:18 ` [tip:smp/urgent] ARM/imx/mmcd: " tip-bot for Thomas Gleixner 2016-12-25 10:02 ` tip-bot for Thomas Gleixner 2016-12-21 19:19 ` [patch 02/10] cpu/hotplug: Prevent overwriting of callbacks Thomas Gleixner 2016-12-22 11:07 ` Thomas Gleixner 2016-12-26 23:04 ` ojab 2016-12-26 23:12 ` ojab 2016-12-22 20:21 ` [tip:smp/urgent] " tip-bot for Thomas Gleixner 2016-12-25 10:04 ` tip-bot for Thomas Gleixner 2016-12-21 19:19 ` [patch 03/10] scsi/bnx2fc: Convert to hotplug state machine Thomas Gleixner 2016-12-22 20:21 ` [tip:smp/urgent] " tip-bot for Sebastian Andrzej Siewior 2016-12-25 10:05 ` tip-bot for Sebastian Andrzej Siewior 2016-12-21 19:19 ` [patch 04/10] scsi/bnx2i: " Thomas Gleixner 2016-12-22 20:22 ` [tip:smp/urgent] " tip-bot for Sebastian Andrzej Siewior 2016-12-25 10:05 ` tip-bot for Sebastian Andrzej Siewior 2016-12-21 19:19 ` [patch 05/10] staging/lustre/libcfs: " Thomas Gleixner 2016-12-21 19:29 ` [lustre-devel] " Thomas Gleixner 2016-12-22 20:22 ` [tip:smp/urgent] " tip-bot for Anna-Maria Gleixner 2016-12-25 10:06 ` tip-bot for Anna-Maria Gleixner 2016-12-21 19:19 ` [patch 06/10] cpu/hotplug: Remove obsolete cpu hotplug register/unregister functions Thomas Gleixner 2016-12-22 20:23 ` [tip:smp/urgent] " tip-bot for Thomas Gleixner 2016-12-25 10:06 ` tip-bot for Thomas Gleixner 2016-12-21 19:19 ` [patch 07/10] cpu/hotplug: Cleanup state names Thomas Gleixner 2016-12-22 20:23 ` [tip:smp/urgent] " tip-bot for Thomas Gleixner 2016-12-25 10:07 ` tip-bot for Thomas Gleixner 2016-12-21 19:19 ` [patch 08/10] coresight: etm3/4x: Consolidate hotplug state space Thomas Gleixner 2016-12-22 16:30 ` Mathieu Poirier 2016-12-22 20:24 ` [tip:smp/urgent] coresight/etm3/4x: " tip-bot for Thomas Gleixner 2016-12-25 10:07 ` tip-bot for Thomas Gleixner 2016-12-21 19:19 ` [patch 09/10] irqchip/gic: " Thomas Gleixner 2016-12-22 20:24 ` [tip:smp/urgent] " tip-bot for Thomas Gleixner 2016-12-25 10:08 ` tip-bot for Thomas Gleixner 2016-12-21 19:19 ` [patch 10/10] irqchip/armada-xp: " Thomas Gleixner 2016-12-21 20:22 ` Thomas Petazzoni 2016-12-21 20:27 ` Thomas Gleixner 2016-12-22 20:25 ` [tip:smp/urgent] " tip-bot for Thomas Gleixner 2016-12-25 10:08 ` tip-bot for Thomas Gleixner 2016-12-22 17:59 ` [patch 00/10] cpu/hotplug: Final cleanup Sam Ravnborg 2016-12-27 11:17 ` Thomas Gleixner 2016-12-27 19:41 ` Sam Ravnborg
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20161126231350.10321-11-bigeasy@linutronix.de \ --to=bigeasy@linutronix.de \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=minchan@kernel.org \ --cc=ngupta@vflare.org \ --cc=rt@linutronix.de \ --cc=sergey.senozhatsky.work@gmail.com \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.