Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758385AbZKZDX2 (ORCPT ); Wed, 25 Nov 2009 22:23:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758225AbZKZDX1 (ORCPT ); Wed, 25 Nov 2009 22:23:27 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:37499 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758195AbZKZDX0 (ORCPT ); Wed, 25 Nov 2009 22:23:26 -0500 Message-ID: <4B0DF4AD.5090306@austin.ibm.com> Date: Wed, 25 Nov 2009 21:23:25 -0600 From: Nathan Fontenot User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org CC: gregkh@suse.de, paul Mackerras Subject: Re: [PATCH v3 2/3] sysfs cpu probe/release files References: <4B0CD70F.6090600@austin.ibm.com> <4B0CD8D5.8050803@austin.ibm.com> In-Reply-To: <4B0CD8D5.8050803@austin.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6204 Lines: 176 Version 3 of this patch is updated with documentation added to Documentation/ABI. There are no changes to any of the C code from v2 of the patch. In order to support kernel DLPAR of CPU resources we need to provide an interface to add (probe) and remove (release) the resource from the system. This patch Creates new generic probe and release sysfs files to facilitate cpu probe/release. The probe/release interface provides for allowing each arch to supply their own routines for implementing the backend of adding and removing cpus to/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 --- Documentation/ABI/testing/sysfs-devices-system-cpu | 15 +++++++++ arch/powerpc/Kconfig | 4 ++ arch/powerpc/include/asm/machdep.h | 5 +++ arch/powerpc/kernel/sysfs.c | 19 ++++++++++++ drivers/base/cpu.c | 32 +++++++++++++++++++++ include/linux/cpu.h | 2 + 6 files changed, 77 insertions(+) Index: powerpc/drivers/base/cpu.c =================================================================== --- powerpc.orig/drivers/base/cpu.c 2009-11-25 04:52:37.000000000 -0600 +++ powerpc/drivers/base/cpu.c 2009-11-25 04:54:25.000000000 -0600 @@ -72,6 +72,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-11-25 04:52:37.000000000 -0600 +++ powerpc/arch/powerpc/include/asm/machdep.h 2009-11-25 04:54:25.000000000 -0600 @@ -266,6 +266,11 @@ void (*suspend_disable_irqs)(void); void (*suspend_enable_irqs)(void); #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-11-25 04:52:37.000000000 -0600 +++ powerpc/arch/powerpc/kernel/sysfs.c 2009-11-25 04:54:25.000000000 -0600 @@ -461,6 +461,25 @@ cacheinfo_cpu_offline(cpu); } + +#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 /* CONFIG_ARCH_CPU_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-11-25 04:52:37.000000000 -0600 +++ powerpc/arch/powerpc/Kconfig 2009-11-25 04:54:25.000000000 -0600 @@ -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-11-25 04:52:37.000000000 -0600 +++ powerpc/include/linux/cpu.h 2009-11-25 04:54:25.000000000 -0600 @@ -43,6 +43,8 @@ #ifdef CONFIG_HOTPLUG_CPU extern void unregister_cpu(struct cpu *cpu); +extern ssize_t arch_cpu_probe(const char *, size_t); +extern ssize_t arch_cpu_release(const char *, size_t); #endif struct notifier_block; Index: powerpc/Documentation/ABI/testing/sysfs-devices-system-cpu =================================================================== --- powerpc.orig/Documentation/ABI/testing/sysfs-devices-system-cpu 2009-11-20 17:53:51.000000000 -0600 +++ powerpc/Documentation/ABI/testing/sysfs-devices-system-cpu 2009-11-26 01:29:25.000000000 -0600 @@ -62,6 +62,21 @@ See Documentation/cputopology.txt for more information. +What: /sys/devices/system/cpu/probe + /sys/devices/system/cpu/release +Date: November 2009 +Contact: Linux kernel mailing list +Description: Dynamic addition and removal of CPU's. This is not hotplug + removal, this is meant complete removal/addition of the CPU + from the system. + + probe: writes to this file will dynamically add a CPU to the + system. Information written to the file to add CPU's is + architecture specific. + + release: writes to this file dynamically remove a CPU from + the system. Information writtento the file to remove CPU's + is architecture specific. What: /sys/devices/system/cpu/cpu#/node Date: October 2009 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/