| Message ID | 4AE8B072.1070603@austin.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Wed, 2009-10-28 at 15:58 -0500, Nathan Fontenot wrote: > Create new probe and release sysfs files to facilitate adding and removing > cpus from the system. This also creates the powerpc specific stubs to handle > the arch callouts from writes to the sysfs files. > > The creation and use of these files is regulated by the > CONFIG_ARCH_CPU_PROBE_RELEASE option so that only architectures that need the > capability will have the files created. > > Signed-off-by: Nathan Fontenot <nfont at austin.ibm.com> > --- Same question as before here... need some external acks from others doing cpu hotplug. Cheers, Ben. > Index: powerpc/drivers/base/cpu.c > =================================================================== > --- powerpc.orig/drivers/base/cpu.c 2009-10-28 15:20:34.000000000 -0500 > +++ powerpc/drivers/base/cpu.c 2009-10-28 15:21:53.000000000 -0500 > @@ -54,6 +54,7 @@ > ret = count; > return ret; > } > + > static SYSDEV_ATTR(online, 0644, show_online, store_online); > > static void __cpuinit register_cpu_control(struct cpu *cpu) > @@ -72,6 +73,38 @@ > per_cpu(cpu_sys_devices, logical_cpu) = NULL; > return; > } > + > +#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE > +static ssize_t cpu_probe_store(struct class *class, const char *buf, > + size_t count) > +{ > + return arch_cpu_probe(buf, count); > +} > + > +static ssize_t cpu_release_store(struct class *class, const char *buf, > + size_t count) > +{ > + return arch_cpu_release(buf, count); > +} > + > +static CLASS_ATTR(probe, S_IWUSR, NULL, cpu_probe_store); > +static CLASS_ATTR(release, S_IWUSR, NULL, cpu_release_store); > + > +int __init cpu_probe_release_init(void) > +{ > + int rc; > + > + rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj, > + &class_attr_probe.attr); > + if (!rc) > + rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj, > + &class_attr_release.attr); > + > + return rc; > +} > +device_initcall(cpu_probe_release_init); > +#endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ > + > #else /* ... !CONFIG_HOTPLUG_CPU */ > static inline void register_cpu_control(struct cpu *cpu) > { > Index: powerpc/arch/powerpc/include/asm/machdep.h > =================================================================== > --- powerpc.orig/arch/powerpc/include/asm/machdep.h 2009-10-28 15:21:47.000000000 -0500 > +++ powerpc/arch/powerpc/include/asm/machdep.h 2009-10-28 15:21:53.000000000 -0500 > @@ -274,6 +274,11 @@ > int (*memory_probe)(u64); > #endif > > +#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE > + ssize_t (*cpu_probe)(const char *, size_t); > + ssize_t (*cpu_release)(const char *, size_t); > +#endif > + > }; > > extern void e500_idle(void); > Index: powerpc/arch/powerpc/kernel/sysfs.c > =================================================================== > --- powerpc.orig/arch/powerpc/kernel/sysfs.c 2009-10-28 15:20:34.000000000 -0500 > +++ powerpc/arch/powerpc/kernel/sysfs.c 2009-10-28 15:21:53.000000000 -0500 > @@ -461,6 +461,25 @@ > > cacheinfo_cpu_offline(cpu); > } > + > +#ifdef CONFIG_ARCH_PROBE_RELEASE > +ssize_t arch_cpu_probe(const char *buf, size_t count) > +{ > + if (ppc_md.cpu_probe) > + return ppc_md.cpu_probe(buf, count); > + > + return -EINVAL; > +} > + > +ssize_t arch_cpu_release(const char *buf, size_t count) > +{ > + if (ppc_md.cpu_release) > + return ppc_md.cpu_release(buf, count); > + > + return -EINVAL; > +} > +#endif /* CONFIG_ARCH_PROBE_RELEASE */ > + > #endif /* CONFIG_HOTPLUG_CPU */ > > static int __cpuinit sysfs_cpu_notify(struct notifier_block *self, > Index: powerpc/arch/powerpc/Kconfig > =================================================================== > --- powerpc.orig/arch/powerpc/Kconfig 2009-10-28 15:21:47.000000000 -0500 > +++ powerpc/arch/powerpc/Kconfig 2009-10-28 15:21:53.000000000 -0500 > @@ -320,6 +320,10 @@ > > Say N if you are unsure. > > +config ARCH_CPU_PROBE_RELEASE > + def_bool y > + depends on HOTPLUG_CPU > + > config ARCH_ENABLE_MEMORY_HOTPLUG > def_bool y > > Index: powerpc/include/linux/cpu.h > =================================================================== > --- powerpc.orig/include/linux/cpu.h 2009-10-28 15:20:34.000000000 -0500 > +++ powerpc/include/linux/cpu.h 2009-10-28 15:21:53.000000000 -0500 > @@ -43,6 +43,10 @@ > > #ifdef CONFIG_HOTPLUG_CPU > extern void unregister_cpu(struct cpu *cpu); > +#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE > +extern ssize_t arch_cpu_probe(const char *, size_t); > +extern ssize_t arch_cpu_release(const char *, size_t); > +#endif > #endif > > struct notifier_block; > Index: powerpc/arch/powerpc/kernel/smp.c > =================================================================== > --- powerpc.orig/arch/powerpc/kernel/smp.c 2009-10-28 15:20:34.000000000 -0500 > +++ powerpc/arch/powerpc/kernel/smp.c 2009-10-28 15:21:53.000000000 -0500 > @@ -364,7 +364,24 @@ > set_cpu_online(cpu, true); > local_irq_enable(); > } > + > +#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE > +ssize_t arch_cpu_probe(const char *buf, size_t count) > +{ > + if (ppc_md.cpu_probe) > + return ppc_md.cpu_probe(buf, count); > + > + return -EINVAL; > +} > +ssize_t arch_cpu_release(const char *buf, size_t count) > +{ > + if (ppc_md.cpu_release) > + return ppc_md.cpu_release(buf, count); > + > + return -EINVAL; > +} > #endif > +#endif /* CONFIG_HOTPLUG_CPU */ > > static int __devinit cpu_enable(unsigned int cpu) > { > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev
Nathan Fontenot <nfont@austin.ibm.com> writes: > Index: powerpc/arch/powerpc/Kconfig > =================================================================== > --- powerpc.orig/arch/powerpc/Kconfig 2009-10-28 15:21:47.000000000 -0500 > +++ powerpc/arch/powerpc/Kconfig 2009-10-28 15:21:53.000000000 -0500 > @@ -320,6 +320,10 @@ > > Say N if you are unsure. > > +config ARCH_CPU_PROBE_RELEASE > + def_bool y > + depends on HOTPLUG_CPU > + That does not work. drivers/built-in.o: In function `.store_online': cpu.c:(.ref.text+0xf5c): undefined reference to `.cpu_hotplug_driver_lock' cpu.c:(.ref.text+0xfc8): undefined reference to `.cpu_hotplug_driver_unlock' make: *** [.tmp_vmlinux1] Error 1 cpu_hotplug_driver_lock is only defined on pseries, but HOTPLUG_CPU is also defined on pmac. Andreas.
Andreas Schwab wrote: > Nathan Fontenot <nfont@austin.ibm.com> writes: > >> Index: powerpc/arch/powerpc/Kconfig >> =================================================================== >> --- powerpc.orig/arch/powerpc/Kconfig 2009-10-28 15:21:47.000000000 -0500 >> +++ powerpc/arch/powerpc/Kconfig 2009-10-28 15:21:53.000000000 -0500 >> @@ -320,6 +320,10 @@ >> >> Say N if you are unsure. >> >> +config ARCH_CPU_PROBE_RELEASE >> + def_bool y >> + depends on HOTPLUG_CPU >> + > > That does not work. > > drivers/built-in.o: In function `.store_online': > cpu.c:(.ref.text+0xf5c): undefined reference to `.cpu_hotplug_driver_lock' > cpu.c:(.ref.text+0xfc8): undefined reference to `.cpu_hotplug_driver_unlock' > make: *** [.tmp_vmlinux1] Error 1 > > cpu_hotplug_driver_lock is only defined on pseries, but HOTPLUG_CPU is > also defined on pmac. These two routines should be defined as a no-op if CONFIG_ARCH_CPU_PROBE_RELEASE is not defined in linux/cpu.h. The update below should be in the patch set you are looking at. from linux/cpu.h: #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE extern void cpu_hotplug_driver_lock(void); extern void cpu_hotplug_driver_unlock(void); #else static inline void cpu_hotplug_driver_lock(void) { } static inline void cpu_hotplug_driver_unlock(void) { } #endif -Nathan Fontenot
Nathan Fontenot <nfont@austin.ibm.com> writes: > Andreas Schwab wrote: >> Nathan Fontenot <nfont@austin.ibm.com> writes: >> >>> Index: powerpc/arch/powerpc/Kconfig >>> =================================================================== >>> --- powerpc.orig/arch/powerpc/Kconfig 2009-10-28 15:21:47.000000000 -0500 >>> +++ powerpc/arch/powerpc/Kconfig 2009-10-28 15:21:53.000000000 -0500 >>> @@ -320,6 +320,10 @@ >>> Say N if you are unsure. >>> +config ARCH_CPU_PROBE_RELEASE >>> + def_bool y >>> + depends on HOTPLUG_CPU >>> + >> >> That does not work. >> >> drivers/built-in.o: In function `.store_online': >> cpu.c:(.ref.text+0xf5c): undefined reference to `.cpu_hotplug_driver_lock' >> cpu.c:(.ref.text+0xfc8): undefined reference to `.cpu_hotplug_driver_unlock' >> make: *** [.tmp_vmlinux1] Error 1 >> >> cpu_hotplug_driver_lock is only defined on pseries, but HOTPLUG_CPU is >> also defined on pmac. > > These two routines should be defined as a no-op if CONFIG_ARCH_CPU_PROBE_RELEASE > is not defined in linux/cpu.h. ??? CONFIG_ARCH_CPU_PROBE_RELEASE *is* defined. Andreas.
On Fri, 2009-12-18 at 15:33 +0100, Andreas Schwab wrote: > Nathan Fontenot <nfont@austin.ibm.com> writes: > > > Index: powerpc/arch/powerpc/Kconfig > > =================================================================== > > --- powerpc.orig/arch/powerpc/Kconfig 2009-10-28 15:21:47.000000000 -0500 > > +++ powerpc/arch/powerpc/Kconfig 2009-10-28 15:21:53.000000000 -0500 > > @@ -320,6 +320,10 @@ > > > > Say N if you are unsure. > > > > +config ARCH_CPU_PROBE_RELEASE > > + def_bool y > > + depends on HOTPLUG_CPU > > + > > That does not work. > > drivers/built-in.o: In function `.store_online': > cpu.c:(.ref.text+0xf5c): undefined reference to `.cpu_hotplug_driver_lock' > cpu.c:(.ref.text+0xfc8): undefined reference to `.cpu_hotplug_driver_unlock' > make: *** [.tmp_vmlinux1] Error 1 > > cpu_hotplug_driver_lock is only defined on pseries, but HOTPLUG_CPU is > also defined on pmac. Well, the stuff was merged ... so we need to fix it. Nathan, the problem is that the above wlil define ARCH_CPU_PROBE_RELEASE for any powerpc platform that has HOTPLUG_CPU. So a kernel that doesn't have pSeries support but has hotplug CPU will have a problem, though for some reason none of my test configs triggered it (I'll have to check why next week). The right approach here is to have cpu_hotplug_driver_lock go through ppc_md. I suppose, along with some of the other CPU hotplug platform specific bits. Cheers, Ben.
Benjamin Herrenschmidt <benh@kernel.crashing.org> writes: > Nathan, the problem is that the above wlil define ARCH_CPU_PROBE_RELEASE > for any powerpc platform that has HOTPLUG_CPU. So a kernel that doesn't > have pSeries support but has hotplug CPU will have a problem, though for > some reason none of my test configs triggered it (I'll have to check why > next week). Perhaps you didn't enable CONFIG_SUSPEND. Andreas.
Benjamin Herrenschmidt wrote: > On Fri, 2009-12-18 at 15:33 +0100, Andreas Schwab wrote: >> Nathan Fontenot <nfont@austin.ibm.com> writes: >> >>> Index: powerpc/arch/powerpc/Kconfig >>> =================================================================== >>> --- powerpc.orig/arch/powerpc/Kconfig 2009-10-28 15:21:47.000000000 -0500 >>> +++ powerpc/arch/powerpc/Kconfig 2009-10-28 15:21:53.000000000 -0500 >>> @@ -320,6 +320,10 @@ >>> >>> Say N if you are unsure. >>> >>> +config ARCH_CPU_PROBE_RELEASE >>> + def_bool y >>> + depends on HOTPLUG_CPU >>> + >> That does not work. >> >> drivers/built-in.o: In function `.store_online': >> cpu.c:(.ref.text+0xf5c): undefined reference to `.cpu_hotplug_driver_lock' >> cpu.c:(.ref.text+0xfc8): undefined reference to `.cpu_hotplug_driver_unlock' >> make: *** [.tmp_vmlinux1] Error 1 >> >> cpu_hotplug_driver_lock is only defined on pseries, but HOTPLUG_CPU is >> also defined on pmac. > > Well, the stuff was merged ... so we need to fix it. > > Nathan, the problem is that the above wlil define ARCH_CPU_PROBE_RELEASE > for any powerpc platform that has HOTPLUG_CPU. So a kernel that doesn't > have pSeries support but has hotplug CPU will have a problem, though for > some reason none of my test configs triggered it (I'll have to check why > next week). > > The right approach here is to have cpu_hotplug_driver_lock go through > ppc_md. I suppose, along with some of the other CPU hotplug platform > specific bits. > Sounds good to me, I'll get a patch together. -Nathan Fontenot
Index: powerpc/drivers/base/cpu.c =================================================================== --- powerpc.orig/drivers/base/cpu.c 2009-10-28 15:20:34.000000000 -0500 +++ powerpc/drivers/base/cpu.c 2009-10-28 15:21:53.000000000 -0500 @@ -54,6 +54,7 @@ ret = count; return ret; } + static SYSDEV_ATTR(online, 0644, show_online, store_online); static void __cpuinit register_cpu_control(struct cpu *cpu) @@ -72,6 +73,38 @@ per_cpu(cpu_sys_devices, logical_cpu) = NULL; return; } + +#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE +static ssize_t cpu_probe_store(struct class *class, const char *buf, + size_t count) +{ + return arch_cpu_probe(buf, count); +} + +static ssize_t cpu_release_store(struct class *class, const char *buf, + size_t count) +{ + return arch_cpu_release(buf, count); +} + +static CLASS_ATTR(probe, S_IWUSR, NULL, cpu_probe_store); +static CLASS_ATTR(release, S_IWUSR, NULL, cpu_release_store); + +int __init cpu_probe_release_init(void) +{ + int rc; + + rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj, + &class_attr_probe.attr); + if (!rc) + rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj, + &class_attr_release.attr); + + return rc; +} +device_initcall(cpu_probe_release_init); +#endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ + #else /* ... !CONFIG_HOTPLUG_CPU */ static inline void register_cpu_control(struct cpu *cpu) { Index: powerpc/arch/powerpc/include/asm/machdep.h =================================================================== --- powerpc.orig/arch/powerpc/include/asm/machdep.h 2009-10-28 15:21:47.000000000 -0500 +++ powerpc/arch/powerpc/include/asm/machdep.h 2009-10-28 15:21:53.000000000 -0500 @@ -274,6 +274,11 @@ int (*memory_probe)(u64); #endif +#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE + ssize_t (*cpu_probe)(const char *, size_t); + ssize_t (*cpu_release)(const char *, size_t); +#endif + }; extern void e500_idle(void); Index: powerpc/arch/powerpc/kernel/sysfs.c =================================================================== --- powerpc.orig/arch/powerpc/kernel/sysfs.c 2009-10-28 15:20:34.000000000 -0500 +++ powerpc/arch/powerpc/kernel/sysfs.c 2009-10-28 15:21:53.000000000 -0500 @@ -461,6 +461,25 @@ cacheinfo_cpu_offline(cpu); } + +#ifdef CONFIG_ARCH_PROBE_RELEASE +ssize_t arch_cpu_probe(const char *buf, size_t count) +{ + if (ppc_md.cpu_probe) + return ppc_md.cpu_probe(buf, count); + + return -EINVAL; +} + +ssize_t arch_cpu_release(const char *buf, size_t count) +{ + if (ppc_md.cpu_release) + return ppc_md.cpu_release(buf, count); + + return -EINVAL; +} +#endif /* CONFIG_ARCH_PROBE_RELEASE */ + #endif /* CONFIG_HOTPLUG_CPU */ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self, Index: powerpc/arch/powerpc/Kconfig =================================================================== --- powerpc.orig/arch/powerpc/Kconfig 2009-10-28 15:21:47.000000000 -0500 +++ powerpc/arch/powerpc/Kconfig 2009-10-28 15:21:53.000000000 -0500 @@ -320,6 +320,10 @@ Say N if you are unsure. +config ARCH_CPU_PROBE_RELEASE + def_bool y + depends on HOTPLUG_CPU + config ARCH_ENABLE_MEMORY_HOTPLUG def_bool y Index: powerpc/include/linux/cpu.h =================================================================== --- powerpc.orig/include/linux/cpu.h 2009-10-28 15:20:34.000000000 -0500 +++ powerpc/include/linux/cpu.h 2009-10-28 15:21:53.000000000 -0500 @@ -43,6 +43,10 @@ #ifdef CONFIG_HOTPLUG_CPU extern void unregister_cpu(struct cpu *cpu); +#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE +extern ssize_t arch_cpu_probe(const char *, size_t); +extern ssize_t arch_cpu_release(const char *, size_t); +#endif #endif struct notifier_block; Index: powerpc/arch/powerpc/kernel/smp.c =================================================================== --- powerpc.orig/arch/powerpc/kernel/smp.c 2009-10-28 15:20:34.000000000 -0500 +++ powerpc/arch/powerpc/kernel/smp.c 2009-10-28 15:21:53.000000000 -0500 @@ -364,7 +364,24 @@ set_cpu_online(cpu, true); local_irq_enable(); } + +#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE +ssize_t arch_cpu_probe(const char *buf, size_t count) +{ + if (ppc_md.cpu_probe) + return ppc_md.cpu_probe(buf, count); + + return -EINVAL; +} +ssize_t arch_cpu_release(const char *buf, size_t count) +{ + if (ppc_md.cpu_release) + return ppc_md.cpu_release(buf, count); + + return -EINVAL; +} #endif +#endif /* CONFIG_HOTPLUG_CPU */ static int __devinit cpu_enable(unsigned int cpu) {
Create new probe and release sysfs files to facilitate adding and removing cpus from the system. This also creates the powerpc specific stubs to handle the arch callouts from writes to the sysfs files. The creation and use of these files is regulated by the CONFIG_ARCH_CPU_PROBE_RELEASE option so that only architectures that need the capability will have the files created. Signed-off-by: Nathan Fontenot <nfont at austin.ibm.com> ---