From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> To: linux-kernel@vger.kernel.org Cc: rt@linuxtronix.de, Sebastian Andrzej Siewior <bigeasy@linutronix.de>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 16/20] powerpc/sysfs: Convert to hotplug state machine Date: Thu, 17 Nov 2016 19:35:37 +0100 [thread overview] Message-ID: <20161117183541.8588-17-bigeasy@linutronix.de> (raw) In-Reply-To: <20161117183541.8588-1-bigeasy@linutronix.de> Install the callbacks via the state machine and let the core invoke the callbacks on the already online CPUs. The previous convention of keeping the files around until the CPU is dead has not been preserved as there is no point to keep them available when the cpu is going down. This makes the hotplug call symmetric. Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- arch/powerpc/kernel/sysfs.c | 50 +++++++++------------------------------------ 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index c4f1d1f7bae0..c1fb255a60d6 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -703,7 +703,7 @@ static struct device_attribute pa6t_attrs[] = { #endif /* HAS_PPC_PMC_PA6T */ #endif /* HAS_PPC_PMC_CLASSIC */ -static void register_cpu_online(unsigned int cpu) +static int register_cpu_online(unsigned int cpu) { struct cpu *c = &per_cpu(cpu_devices, cpu); struct device *s = &c->dev; @@ -782,11 +782,12 @@ static void register_cpu_online(unsigned int cpu) } #endif cacheinfo_cpu_online(cpu); + return 0; } -#ifdef CONFIG_HOTPLUG_CPU -static void unregister_cpu_online(unsigned int cpu) +static int unregister_cpu_online(unsigned int cpu) { +#ifdef CONFIG_HOTPLUG_CPU struct cpu *c = &per_cpu(cpu_devices, cpu); struct device *s = &c->dev; struct device_attribute *attrs, *pmc_attrs; @@ -863,6 +864,8 @@ static void unregister_cpu_online(unsigned int cpu) } #endif cacheinfo_cpu_offline(cpu); +#endif /* CONFIG_HOTPLUG_CPU */ + return 0; } #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE @@ -883,32 +886,6 @@ ssize_t arch_cpu_release(const char *buf, size_t count) } #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ -#endif /* CONFIG_HOTPLUG_CPU */ - -static int sysfs_cpu_notify(struct notifier_block *self, - unsigned long action, void *hcpu) -{ - unsigned int cpu = (unsigned int)(long)hcpu; - - switch (action) { - case CPU_ONLINE: - case CPU_ONLINE_FROZEN: - register_cpu_online(cpu); - break; -#ifdef CONFIG_HOTPLUG_CPU - case CPU_DEAD: - case CPU_DEAD_FROZEN: - unregister_cpu_online(cpu); - break; -#endif - } - return NOTIFY_OK; -} - -static struct notifier_block sysfs_cpu_nb = { - .notifier_call = sysfs_cpu_notify, -}; - static DEFINE_MUTEX(cpu_mutex); int cpu_add_dev_attr(struct device_attribute *attr) @@ -1023,12 +1000,10 @@ static DEVICE_ATTR(physical_id, 0444, show_physical_id, NULL); static int __init topology_init(void) { - int cpu; + int cpu, r; register_nodes(); - cpu_notifier_register_begin(); - for_each_possible_cpu(cpu) { struct cpu *c = &per_cpu(cpu_devices, cpu); @@ -1047,15 +1022,10 @@ static int __init topology_init(void) device_create_file(&c->dev, &dev_attr_physical_id); } - - if (cpu_online(cpu)) - register_cpu_online(cpu); } - - __register_cpu_notifier(&sysfs_cpu_nb); - - cpu_notifier_register_done(); - + r = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "powerpc/topology:online", + register_cpu_online, unregister_cpu_online); + WARN_ON(r < 0); #ifdef CONFIG_PPC64 sysfs_create_dscr_default(); #endif /* CONFIG_PPC64 */ -- 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@linuxtronix.de, Sebastian Andrzej Siewior <bigeasy@linutronix.de>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 16/20] powerpc/sysfs: Convert to hotplug state machine Date: Thu, 17 Nov 2016 19:35:37 +0100 [thread overview] Message-ID: <20161117183541.8588-17-bigeasy@linutronix.de> (raw) In-Reply-To: <20161117183541.8588-1-bigeasy@linutronix.de> Install the callbacks via the state machine and let the core invoke the callbacks on the already online CPUs. The previous convention of keeping the files around until the CPU is dead has not been preserved as there is no point to keep them available when the cpu is going down. This makes the hotplug call symmetric. Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- arch/powerpc/kernel/sysfs.c | 50 +++++++++--------------------------------= ---- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index c4f1d1f7bae0..c1fb255a60d6 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -703,7 +703,7 @@ static struct device_attribute pa6t_attrs[] =3D { #endif /* HAS_PPC_PMC_PA6T */ #endif /* HAS_PPC_PMC_CLASSIC */ =20 -static void register_cpu_online(unsigned int cpu) +static int register_cpu_online(unsigned int cpu) { struct cpu *c =3D &per_cpu(cpu_devices, cpu); struct device *s =3D &c->dev; @@ -782,11 +782,12 @@ static void register_cpu_online(unsigned int cpu) } #endif cacheinfo_cpu_online(cpu); + return 0; } =20 -#ifdef CONFIG_HOTPLUG_CPU -static void unregister_cpu_online(unsigned int cpu) +static int unregister_cpu_online(unsigned int cpu) { +#ifdef CONFIG_HOTPLUG_CPU struct cpu *c =3D &per_cpu(cpu_devices, cpu); struct device *s =3D &c->dev; struct device_attribute *attrs, *pmc_attrs; @@ -863,6 +864,8 @@ static void unregister_cpu_online(unsigned int cpu) } #endif cacheinfo_cpu_offline(cpu); +#endif /* CONFIG_HOTPLUG_CPU */ + return 0; } =20 #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE @@ -883,32 +886,6 @@ ssize_t arch_cpu_release(const char *buf, size_t count) } #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ =20 -#endif /* CONFIG_HOTPLUG_CPU */ - -static int sysfs_cpu_notify(struct notifier_block *self, - unsigned long action, void *hcpu) -{ - unsigned int cpu =3D (unsigned int)(long)hcpu; - - switch (action) { - case CPU_ONLINE: - case CPU_ONLINE_FROZEN: - register_cpu_online(cpu); - break; -#ifdef CONFIG_HOTPLUG_CPU - case CPU_DEAD: - case CPU_DEAD_FROZEN: - unregister_cpu_online(cpu); - break; -#endif - } - return NOTIFY_OK; -} - -static struct notifier_block sysfs_cpu_nb =3D { - .notifier_call =3D sysfs_cpu_notify, -}; - static DEFINE_MUTEX(cpu_mutex); =20 int cpu_add_dev_attr(struct device_attribute *attr) @@ -1023,12 +1000,10 @@ static DEVICE_ATTR(physical_id, 0444, show_physical= _id, NULL); =20 static int __init topology_init(void) { - int cpu; + int cpu, r; =20 register_nodes(); =20 - cpu_notifier_register_begin(); - for_each_possible_cpu(cpu) { struct cpu *c =3D &per_cpu(cpu_devices, cpu); =20 @@ -1047,15 +1022,10 @@ static int __init topology_init(void) =20 device_create_file(&c->dev, &dev_attr_physical_id); } - - if (cpu_online(cpu)) - register_cpu_online(cpu); } - - __register_cpu_notifier(&sysfs_cpu_nb); - - cpu_notifier_register_done(); - + r =3D cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "powerpc/topology:online", + register_cpu_online, unregister_cpu_online); + WARN_ON(r < 0); #ifdef CONFIG_PPC64 sysfs_create_dscr_default(); #endif /* CONFIG_PPC64 */ --=20 2.10.2
next prev parent reply other threads:[~2016-11-17 18:37 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-17 18:35 cpu hotplug: convert more drivers (batch #5) Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 01/20] x86/mce/therm_throt: Convert to hotplug state machine Sebastian Andrzej Siewior 2016-11-21 15:46 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:39 ` tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 02/20] x86/cpuid: " Sebastian Andrzej Siewior 2016-11-21 15:47 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:40 ` tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 03/20] x86/msr: " Sebastian Andrzej Siewior 2016-11-21 15:48 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:41 ` tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 04/20] hwmon/coretemp: " Sebastian Andrzej Siewior 2016-11-20 22:30 ` [04/20] " Guenter Roeck 2016-11-21 22:35 ` Sebastian Andrzej Siewior 2016-11-21 15:56 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-21 21:32 ` Guenter Roeck 2016-11-21 21:53 ` Thomas Gleixner 2016-11-17 18:35 ` [PATCH 05/20] hwmon/via-cputemp: Remove pointless CPU check on each CPU Sebastian Andrzej Siewior 2016-11-19 17:23 ` [05/20] " Guenter Roeck 2016-11-19 22:53 ` Sebastian Andrzej Siewior 2016-11-20 3:53 ` Guenter Roeck 2016-11-20 20:34 ` Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 06/20] hwmon/via-cputemp: Convert to hotplug state machine Sebastian Andrzej Siewior 2016-11-18 15:09 ` [PATCH 06/20 v2] " Sebastian Andrzej Siewior 2016-11-23 15:29 ` [PATCH 06/20] " Guenter Roeck 2016-12-09 11:53 ` Thomas Gleixner 2016-12-09 18:17 ` Guenter Roeck 2016-12-09 18:27 ` Thomas Gleixner 2016-11-17 18:35 ` [PATCH 07/20] pci/xgene-msi: " Sebastian Andrzej Siewior 2016-11-17 18:35 ` Sebastian Andrzej Siewior 2016-11-17 18:35 ` Sebastian Andrzej Siewior 2016-11-21 15:48 ` [tip:smp/hotplug] PCI/xgene-msi: " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:42 ` tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 08/20] powercap/intel_rapl: Add missing domain data update on hotplug Sebastian Andrzej Siewior 2016-11-21 15:49 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner 2016-11-17 18:35 ` [PATCH 09/20] powercap/intel rapl: Convert to hotplug state machine Sebastian Andrzej Siewior 2016-11-21 15:49 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 10/20] powercap/intel_rapl: Cleanup duplicated init code Sebastian Andrzej Siewior 2016-11-21 15:50 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner 2016-11-17 18:35 ` [PATCH 11/20] watchdog/octeon: Convert to hotplug state machine Sebastian Andrzej Siewior 2016-11-21 15:50 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:43 ` tip-bot for Sebastian Andrzej Siewior 2016-11-24 16:10 ` [11/20] " Guenter Roeck 2016-11-17 18:35 ` [PATCH 12/20] net/iucv: " Sebastian Andrzej Siewior 2016-11-21 15:51 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:43 ` tip-bot for Sebastian Andrzej Siewior 2016-11-23 18:04 ` [PATCH 12/20] " Ursula Braun 2016-11-24 9:10 ` Sebastian Andrzej Siewior 2016-11-24 14:14 ` [PATCH 12/20 v2] " Sebastian Andrzej Siewior 2016-11-24 16:10 ` [PATCH] net/iucv: use explicit clean up labels in iucv_init() Sebastian Andrzej Siewior 2016-11-24 19:57 ` [tip:smp/hotplug] net/iucv: Use " tip-bot for Sebastian Andrzej Siewior 2016-11-28 16:24 ` [PATCH] net/iucv: use " David Miller 2016-11-28 16:31 ` Thomas Gleixner 2016-11-28 16:37 ` [tip:smp/hotplug] net/iucv: Use " tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 13/20] sched/nohz: Convert to hotplug state machine Sebastian Andrzej Siewior 2016-11-21 15:51 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:44 ` tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 14/20] arm/bL_switcher: " Sebastian Andrzej Siewior 2016-11-17 18:35 ` Sebastian Andrzej Siewior 2016-11-21 15:52 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:44 ` tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 15/20] ARM/hw_breakpoint: " Sebastian Andrzej Siewior 2016-11-17 18:35 ` Sebastian Andrzej Siewior 2016-11-18 12:04 ` Will Deacon 2016-11-18 12:04 ` Will Deacon 2016-11-18 13:11 ` Thomas Gleixner 2016-11-18 13:11 ` Thomas Gleixner 2016-11-18 13:29 ` Will Deacon 2016-11-18 13:29 ` Will Deacon 2016-11-18 13:42 ` Thomas Gleixner 2016-11-18 13:42 ` Thomas Gleixner 2016-11-18 13:48 ` Will Deacon 2016-11-18 13:48 ` Will Deacon 2016-11-18 13:59 ` Thomas Gleixner 2016-11-18 13:59 ` Thomas Gleixner 2016-11-18 14:11 ` Will Deacon 2016-11-18 14:11 ` Will Deacon 2016-11-21 15:52 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:45 ` tip-bot for Sebastian Andrzej Siewior 2017-01-02 14:15 ` [PATCH 15/20] " Linus Walleij 2017-01-02 14:15 ` Linus Walleij 2017-01-02 14:34 ` Linus Walleij 2017-01-02 14:34 ` Linus Walleij 2017-01-02 15:00 ` Russell King - ARM Linux 2017-01-02 15:00 ` Russell King - ARM Linux 2017-01-02 20:15 ` Linus Walleij 2017-01-02 20:15 ` Linus Walleij 2017-01-03 9:33 ` Mark Rutland 2017-01-03 9:33 ` Mark Rutland 2017-01-04 11:27 ` Sebastian Andrzej Siewior 2017-01-04 11:27 ` Sebastian Andrzej Siewior 2017-01-04 13:56 ` Mark Rutland 2017-01-04 13:56 ` Mark Rutland 2017-01-04 14:32 ` Will Deacon 2017-01-04 14:32 ` Will Deacon 2017-01-05 15:57 ` Mark Rutland 2017-01-05 15:57 ` Mark Rutland 2017-01-05 15:26 ` Linus Walleij 2017-01-05 15:26 ` Linus Walleij 2017-01-05 17:14 ` Mark Rutland 2017-01-05 17:14 ` Mark Rutland 2016-11-17 18:35 ` Sebastian Andrzej Siewior [this message] 2016-11-17 18:35 ` [PATCH 16/20] powerpc/sysfs: " Sebastian Andrzej Siewior 2016-11-21 15:53 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:45 ` tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 17/20] sparc/sysfs: " Sebastian Andrzej Siewior 2016-11-17 18:35 ` Sebastian Andrzej Siewior 2016-11-17 18:39 ` David Miller 2016-11-17 18:39 ` David Miller 2016-11-21 15:54 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:46 ` tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 18/20] x86/oprofile/nmi: Remove superfluous smp_function_call_single() Sebastian Andrzej Siewior 2016-11-21 15:54 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner 2016-11-22 22:46 ` tip-bot for Anna-Maria Gleixner 2016-11-17 18:35 ` [PATCH 19/20] x86/oprofile/nmi: Convert to hotplug state machine Sebastian Andrzej Siewior 2016-11-21 15:55 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:47 ` tip-bot for Sebastian Andrzej Siewior 2016-11-17 18:35 ` [PATCH 20/20] x86/pci/amd-bus: " Sebastian Andrzej Siewior 2016-11-17 18:35 ` Sebastian Andrzej Siewior 2016-11-21 15:55 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior 2016-11-22 22:47 ` tip-bot for Sebastian Andrzej Siewior
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=20161117183541.8588-17-bigeasy@linutronix.de \ --to=bigeasy@linutronix.de \ --cc=benh@kernel.crashing.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=paulus@samba.org \ --cc=rt@linuxtronix.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.