2005-04-17 00:20:36 +02:00
|
|
|
/*
|
2011-12-21 23:29:42 +01:00
|
|
|
* CPU subsystem support
|
2005-04-17 00:20:36 +02:00
|
|
|
*/
|
|
|
|
|
2012-01-10 03:59:49 +01:00
|
|
|
#include <linux/kernel.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
2006-10-18 07:47:25 +02:00
|
|
|
#include <linux/sched.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/topology.h>
|
|
|
|
#include <linux/device.h>
|
[PATCH] node hotplug: register cpu: remove node struct
With Goto-san's patch, we can add new pgdat/node at runtime. I'm now
considering node-hot-add with cpu + memory on ACPI.
I found acpi container, which describes node, could evaluate cpu before
memory. This means cpu-hot-add occurs before memory hot add.
In most part, cpu-hot-add doesn't depend on node hot add. But register_cpu(),
which creates symbolic link from node to cpu, requires that node should be
onlined before register_cpu(). When a node is onlined, its pgdat should be
there.
This patch-set holds off creating symbolic link from node to cpu
until node is onlined.
This removes node arguments from register_cpu().
Now, register_cpu() requires 'struct node' as its argument. But the array of
struct node is now unified in driver/base/node.c now (By Goto's node hotplug
patch). We can get struct node in generic way. So, this argument is not
necessary now.
This patch also guarantees add cpu under node only when node is onlined. It
is necessary for node-hot-add vs. cpu-hot-add patch following this.
Moreover, register_cpu calculates cpu->node_id by cpu_to_node() without regard
to its 'struct node *root' argument. This patch removes it.
Also modify callers of register_cpu()/unregister_cpu, whose args are changed
by register-cpu-remove-node-struct patch.
[Brice.Goglin@ens-lyon.org: fix it]
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-27 11:53:41 +02:00
|
|
|
#include <linux/node.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 09:04:11 +01:00
|
|
|
#include <linux/gfp.h>
|
2012-01-10 04:04:32 +01:00
|
|
|
#include <linux/percpu.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2005-10-13 18:54:41 +02:00
|
|
|
#include "base.h"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
struct bus_type cpu_subsys = {
|
2007-12-20 02:09:39 +01:00
|
|
|
.name = "cpu",
|
2011-12-21 23:29:42 +01:00
|
|
|
.dev_name = "cpu",
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
2011-12-21 23:29:42 +01:00
|
|
|
EXPORT_SYMBOL_GPL(cpu_subsys);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
static DEFINE_PER_CPU(struct device *, cpu_sys_devices);
|
2005-10-30 23:59:49 +01:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
2011-12-21 23:29:42 +01:00
|
|
|
static ssize_t show_online(struct device *dev,
|
|
|
|
struct device_attribute *attr,
|
2008-07-01 18:48:41 +02:00
|
|
|
char *buf)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2011-12-21 23:29:42 +01:00
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, dev);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
return sprintf(buf, "%u\n", !!cpu_online(cpu->dev.id));
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
static ssize_t __ref store_online(struct device *dev,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
const char *buf, size_t count)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2011-12-21 23:29:42 +01:00
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, dev);
|
2005-04-17 00:20:36 +02:00
|
|
|
ssize_t ret;
|
|
|
|
|
2009-11-26 10:59:05 +01:00
|
|
|
cpu_hotplug_driver_lock();
|
2005-04-17 00:20:36 +02:00
|
|
|
switch (buf[0]) {
|
|
|
|
case '0':
|
2011-12-21 23:29:42 +01:00
|
|
|
ret = cpu_down(cpu->dev.id);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!ret)
|
2005-11-16 09:00:00 +01:00
|
|
|
kobject_uevent(&dev->kobj, KOBJ_OFFLINE);
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
case '1':
|
2011-12-21 23:29:42 +01:00
|
|
|
ret = cpu_up(cpu->dev.id);
|
2005-06-25 23:55:05 +02:00
|
|
|
if (!ret)
|
2005-11-16 09:00:00 +01:00
|
|
|
kobject_uevent(&dev->kobj, KOBJ_ONLINE);
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = -EINVAL;
|
|
|
|
}
|
2009-11-26 10:59:05 +01:00
|
|
|
cpu_hotplug_driver_unlock();
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (ret >= 0)
|
|
|
|
ret = count;
|
|
|
|
return ret;
|
|
|
|
}
|
2011-12-21 23:29:42 +01:00
|
|
|
static DEVICE_ATTR(online, 0644, show_online, store_online);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-03-05 00:09:05 +01:00
|
|
|
static void __cpuinit register_cpu_control(struct cpu *cpu)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2011-12-21 23:29:42 +01:00
|
|
|
device_create_file(&cpu->dev, &dev_attr_online);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
[PATCH] node hotplug: register cpu: remove node struct
With Goto-san's patch, we can add new pgdat/node at runtime. I'm now
considering node-hot-add with cpu + memory on ACPI.
I found acpi container, which describes node, could evaluate cpu before
memory. This means cpu-hot-add occurs before memory hot add.
In most part, cpu-hot-add doesn't depend on node hot add. But register_cpu(),
which creates symbolic link from node to cpu, requires that node should be
onlined before register_cpu(). When a node is onlined, its pgdat should be
there.
This patch-set holds off creating symbolic link from node to cpu
until node is onlined.
This removes node arguments from register_cpu().
Now, register_cpu() requires 'struct node' as its argument. But the array of
struct node is now unified in driver/base/node.c now (By Goto's node hotplug
patch). We can get struct node in generic way. So, this argument is not
necessary now.
This patch also guarantees add cpu under node only when node is onlined. It
is necessary for node-hot-add vs. cpu-hot-add patch following this.
Moreover, register_cpu calculates cpu->node_id by cpu_to_node() without regard
to its 'struct node *root' argument. This patch removes it.
Also modify callers of register_cpu()/unregister_cpu, whose args are changed
by register-cpu-remove-node-struct patch.
[Brice.Goglin@ens-lyon.org: fix it]
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-27 11:53:41 +02:00
|
|
|
void unregister_cpu(struct cpu *cpu)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2011-12-21 23:29:42 +01:00
|
|
|
int logical_cpu = cpu->dev.id;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
[PATCH] node hotplug: register cpu: remove node struct
With Goto-san's patch, we can add new pgdat/node at runtime. I'm now
considering node-hot-add with cpu + memory on ACPI.
I found acpi container, which describes node, could evaluate cpu before
memory. This means cpu-hot-add occurs before memory hot add.
In most part, cpu-hot-add doesn't depend on node hot add. But register_cpu(),
which creates symbolic link from node to cpu, requires that node should be
onlined before register_cpu(). When a node is onlined, its pgdat should be
there.
This patch-set holds off creating symbolic link from node to cpu
until node is onlined.
This removes node arguments from register_cpu().
Now, register_cpu() requires 'struct node' as its argument. But the array of
struct node is now unified in driver/base/node.c now (By Goto's node hotplug
patch). We can get struct node in generic way. So, this argument is not
necessary now.
This patch also guarantees add cpu under node only when node is onlined. It
is necessary for node-hot-add vs. cpu-hot-add patch following this.
Moreover, register_cpu calculates cpu->node_id by cpu_to_node() without regard
to its 'struct node *root' argument. This patch removes it.
Also modify callers of register_cpu()/unregister_cpu, whose args are changed
by register-cpu-remove-node-struct patch.
[Brice.Goglin@ens-lyon.org: fix it]
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-27 11:53:41 +02:00
|
|
|
unregister_cpu_under_node(logical_cpu, cpu_to_node(logical_cpu));
|
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
device_remove_file(&cpu->dev, &dev_attr_online);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
device_unregister(&cpu->dev);
|
2008-05-01 13:35:16 +02:00
|
|
|
per_cpu(cpu_sys_devices, logical_cpu) = NULL;
|
2005-04-17 00:20:36 +02:00
|
|
|
return;
|
|
|
|
}
|
2009-11-25 18:23:25 +01:00
|
|
|
|
|
|
|
#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
|
2011-12-21 23:29:42 +01:00
|
|
|
static ssize_t cpu_probe_store(struct device *dev,
|
|
|
|
struct device_attribute *attr,
|
2010-03-16 00:33:32 +01:00
|
|
|
const char *buf,
|
2009-11-25 18:23:25 +01:00
|
|
|
size_t count)
|
|
|
|
{
|
|
|
|
return arch_cpu_probe(buf, count);
|
|
|
|
}
|
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
static ssize_t cpu_release_store(struct device *dev,
|
|
|
|
struct device_attribute *attr,
|
2010-03-16 00:33:32 +01:00
|
|
|
const char *buf,
|
2009-11-25 18:23:25 +01:00
|
|
|
size_t count)
|
|
|
|
{
|
|
|
|
return arch_cpu_release(buf, count);
|
|
|
|
}
|
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
static DEVICE_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);
|
|
|
|
static DEVICE_ATTR(release, S_IWUSR, NULL, cpu_release_store);
|
2009-11-25 18:23:25 +01:00
|
|
|
#endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
#else /* ... !CONFIG_HOTPLUG_CPU */
|
|
|
|
static inline void register_cpu_control(struct cpu *cpu)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|
|
|
|
|
2006-01-10 05:51:42 +01:00
|
|
|
#ifdef CONFIG_KEXEC
|
|
|
|
#include <linux/kexec.h>
|
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
static ssize_t show_crash_notes(struct device *dev, struct device_attribute *attr,
|
2008-07-01 18:48:41 +02:00
|
|
|
char *buf)
|
2006-01-10 05:51:42 +01:00
|
|
|
{
|
2011-12-21 23:29:42 +01:00
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, dev);
|
2006-01-10 05:51:42 +01:00
|
|
|
ssize_t rc;
|
|
|
|
unsigned long long addr;
|
|
|
|
int cpunum;
|
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
cpunum = cpu->dev.id;
|
2006-01-10 05:51:42 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Might be reading other cpu's data based on which cpu read thread
|
|
|
|
* has been scheduled. But cpu data (memory) is allocated once during
|
|
|
|
* boot up and this data does not change there after. Hence this
|
|
|
|
* operation should be safe. No locking required.
|
|
|
|
*/
|
2009-11-24 07:50:03 +01:00
|
|
|
addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpunum));
|
2006-01-10 05:51:42 +01:00
|
|
|
rc = sprintf(buf, "%Lx\n", addr);
|
|
|
|
return rc;
|
|
|
|
}
|
2011-12-21 23:29:42 +01:00
|
|
|
static DEVICE_ATTR(crash_notes, 0400, show_crash_notes, NULL);
|
2006-01-10 05:51:42 +01:00
|
|
|
#endif
|
|
|
|
|
2008-04-08 20:43:04 +02:00
|
|
|
/*
|
|
|
|
* Print cpu online, possible, present, and system maps
|
|
|
|
*/
|
2010-01-05 12:48:00 +01:00
|
|
|
|
|
|
|
struct cpu_attr {
|
2011-12-21 23:29:42 +01:00
|
|
|
struct device_attribute attr;
|
2010-01-05 12:48:00 +01:00
|
|
|
const struct cpumask *const * const map;
|
|
|
|
};
|
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
static ssize_t show_cpus_attr(struct device *dev,
|
|
|
|
struct device_attribute *attr,
|
2010-01-05 12:48:00 +01:00
|
|
|
char *buf)
|
2008-04-08 20:43:04 +02:00
|
|
|
{
|
2010-01-05 12:48:00 +01:00
|
|
|
struct cpu_attr *ca = container_of(attr, struct cpu_attr, attr);
|
|
|
|
int n = cpulist_scnprintf(buf, PAGE_SIZE-2, *(ca->map));
|
2008-04-08 20:43:04 +02:00
|
|
|
|
|
|
|
buf[n++] = '\n';
|
|
|
|
buf[n] = '\0';
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
#define _CPU_ATTR(name, map) \
|
|
|
|
{ __ATTR(name, 0444, show_cpus_attr, NULL), map }
|
2008-04-08 20:43:04 +02:00
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
/* Keep in sync with cpu_subsys_attrs */
|
2010-01-05 12:48:00 +01:00
|
|
|
static struct cpu_attr cpu_attrs[] = {
|
|
|
|
_CPU_ATTR(online, &cpu_online_mask),
|
|
|
|
_CPU_ATTR(possible, &cpu_possible_mask),
|
|
|
|
_CPU_ATTR(present, &cpu_present_mask),
|
|
|
|
};
|
2008-04-08 20:43:04 +02:00
|
|
|
|
2008-12-16 05:26:48 +01:00
|
|
|
/*
|
|
|
|
* Print values for NR_CPUS and offlined cpus
|
|
|
|
*/
|
2011-12-21 23:29:42 +01:00
|
|
|
static ssize_t print_cpus_kernel_max(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2008-12-16 05:26:48 +01:00
|
|
|
{
|
2009-01-01 03:08:48 +01:00
|
|
|
int n = snprintf(buf, PAGE_SIZE-2, "%d\n", NR_CPUS - 1);
|
2008-12-16 05:26:48 +01:00
|
|
|
return n;
|
|
|
|
}
|
2011-12-21 23:29:42 +01:00
|
|
|
static DEVICE_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL);
|
2008-12-16 05:26:48 +01:00
|
|
|
|
|
|
|
/* arch-optional setting to enable display of offline cpus >= nr_cpu_ids */
|
|
|
|
unsigned int total_cpus;
|
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
static ssize_t print_cpus_offline(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2008-12-16 05:26:48 +01:00
|
|
|
{
|
|
|
|
int n = 0, len = PAGE_SIZE-2;
|
|
|
|
cpumask_var_t offline;
|
|
|
|
|
|
|
|
/* display offline cpus < nr_cpu_ids */
|
|
|
|
if (!alloc_cpumask_var(&offline, GFP_KERNEL))
|
|
|
|
return -ENOMEM;
|
2010-04-27 23:01:20 +02:00
|
|
|
cpumask_andnot(offline, cpu_possible_mask, cpu_online_mask);
|
2008-12-16 05:26:48 +01:00
|
|
|
n = cpulist_scnprintf(buf, len, offline);
|
|
|
|
free_cpumask_var(offline);
|
|
|
|
|
|
|
|
/* display offline cpus >= nr_cpu_ids */
|
|
|
|
if (total_cpus && nr_cpu_ids < total_cpus) {
|
|
|
|
if (n && n < len)
|
|
|
|
buf[n++] = ',';
|
|
|
|
|
|
|
|
if (nr_cpu_ids == total_cpus-1)
|
|
|
|
n += snprintf(&buf[n], len - n, "%d", nr_cpu_ids);
|
|
|
|
else
|
|
|
|
n += snprintf(&buf[n], len - n, "%d-%d",
|
|
|
|
nr_cpu_ids, total_cpus-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
n += snprintf(&buf[n], len - n, "\n");
|
|
|
|
return n;
|
|
|
|
}
|
2011-12-21 23:29:42 +01:00
|
|
|
static DEVICE_ATTR(offline, 0444, print_cpus_offline, NULL);
|
2008-12-16 05:26:48 +01:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/*
|
2007-02-17 19:13:42 +01:00
|
|
|
* register_cpu - Setup a sysfs device for a CPU.
|
2006-12-07 02:14:10 +01:00
|
|
|
* @cpu - cpu->hotpluggable field set to 1 will generate a control file in
|
|
|
|
* sysfs for this CPU.
|
2005-04-17 00:20:36 +02:00
|
|
|
* @num - CPU number to use when creating the device.
|
|
|
|
*
|
|
|
|
* Initialize and register the CPU device.
|
|
|
|
*/
|
2008-02-06 10:36:28 +01:00
|
|
|
int __cpuinit register_cpu(struct cpu *cpu, int num)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
int error;
|
[PATCH] node hotplug: register cpu: remove node struct
With Goto-san's patch, we can add new pgdat/node at runtime. I'm now
considering node-hot-add with cpu + memory on ACPI.
I found acpi container, which describes node, could evaluate cpu before
memory. This means cpu-hot-add occurs before memory hot add.
In most part, cpu-hot-add doesn't depend on node hot add. But register_cpu(),
which creates symbolic link from node to cpu, requires that node should be
onlined before register_cpu(). When a node is onlined, its pgdat should be
there.
This patch-set holds off creating symbolic link from node to cpu
until node is onlined.
This removes node arguments from register_cpu().
Now, register_cpu() requires 'struct node' as its argument. But the array of
struct node is now unified in driver/base/node.c now (By Goto's node hotplug
patch). We can get struct node in generic way. So, this argument is not
necessary now.
This patch also guarantees add cpu under node only when node is onlined. It
is necessary for node-hot-add vs. cpu-hot-add patch following this.
Moreover, register_cpu calculates cpu->node_id by cpu_to_node() without regard
to its 'struct node *root' argument. This patch removes it.
Also modify callers of register_cpu()/unregister_cpu, whose args are changed
by register-cpu-remove-node-struct patch.
[Brice.Goglin@ens-lyon.org: fix it]
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-27 11:53:41 +02:00
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
cpu->node_id = cpu_to_node(num);
|
|
|
|
cpu->dev.id = num;
|
|
|
|
cpu->dev.bus = &cpu_subsys;
|
|
|
|
error = device_register(&cpu->dev);
|
2006-12-07 02:14:10 +01:00
|
|
|
if (!error && cpu->hotpluggable)
|
2005-04-17 00:20:36 +02:00
|
|
|
register_cpu_control(cpu);
|
2005-10-30 23:59:49 +01:00
|
|
|
if (!error)
|
2011-12-21 23:29:42 +01:00
|
|
|
per_cpu(cpu_sys_devices, num) = &cpu->dev;
|
[PATCH] node hotplug: register cpu: remove node struct
With Goto-san's patch, we can add new pgdat/node at runtime. I'm now
considering node-hot-add with cpu + memory on ACPI.
I found acpi container, which describes node, could evaluate cpu before
memory. This means cpu-hot-add occurs before memory hot add.
In most part, cpu-hot-add doesn't depend on node hot add. But register_cpu(),
which creates symbolic link from node to cpu, requires that node should be
onlined before register_cpu(). When a node is onlined, its pgdat should be
there.
This patch-set holds off creating symbolic link from node to cpu
until node is onlined.
This removes node arguments from register_cpu().
Now, register_cpu() requires 'struct node' as its argument. But the array of
struct node is now unified in driver/base/node.c now (By Goto's node hotplug
patch). We can get struct node in generic way. So, this argument is not
necessary now.
This patch also guarantees add cpu under node only when node is onlined. It
is necessary for node-hot-add vs. cpu-hot-add patch following this.
Moreover, register_cpu calculates cpu->node_id by cpu_to_node() without regard
to its 'struct node *root' argument. This patch removes it.
Also modify callers of register_cpu()/unregister_cpu, whose args are changed
by register-cpu-remove-node-struct patch.
[Brice.Goglin@ens-lyon.org: fix it]
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-27 11:53:41 +02:00
|
|
|
if (!error)
|
|
|
|
register_cpu_under_node(num, cpu_to_node(num));
|
2006-01-10 05:51:42 +01:00
|
|
|
|
|
|
|
#ifdef CONFIG_KEXEC
|
|
|
|
if (!error)
|
2011-12-21 23:29:42 +01:00
|
|
|
error = device_create_file(&cpu->dev, &dev_attr_crash_notes);
|
2006-01-10 05:51:42 +01:00
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2011-12-21 23:29:42 +01:00
|
|
|
struct device *get_cpu_device(unsigned cpu)
|
2005-10-30 23:59:49 +01:00
|
|
|
{
|
2008-05-01 13:35:16 +02:00
|
|
|
if (cpu < nr_cpu_ids && cpu_possible(cpu))
|
|
|
|
return per_cpu(cpu_sys_devices, cpu);
|
2005-10-30 23:59:49 +01:00
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
2011-12-21 23:29:42 +01:00
|
|
|
EXPORT_SYMBOL_GPL(get_cpu_device);
|
|
|
|
|
|
|
|
static struct attribute *cpu_root_attrs[] = {
|
|
|
|
#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
|
|
|
|
&dev_attr_probe.attr,
|
|
|
|
&dev_attr_release.attr,
|
|
|
|
#endif
|
|
|
|
&cpu_attrs[0].attr.attr,
|
|
|
|
&cpu_attrs[1].attr.attr,
|
|
|
|
&cpu_attrs[2].attr.attr,
|
|
|
|
&dev_attr_kernel_max.attr,
|
|
|
|
&dev_attr_offline.attr,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct attribute_group cpu_root_attr_group = {
|
|
|
|
.attrs = cpu_root_attrs,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct attribute_group *cpu_root_attr_groups[] = {
|
|
|
|
&cpu_root_attr_group,
|
|
|
|
NULL,
|
|
|
|
};
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2011-12-03 22:06:50 +01:00
|
|
|
bool cpu_is_hotpluggable(unsigned cpu)
|
|
|
|
{
|
2012-01-07 21:03:30 +01:00
|
|
|
struct device *dev = get_cpu_device(cpu);
|
|
|
|
return dev && container_of(dev, struct cpu, dev)->hotpluggable;
|
2011-12-03 22:06:50 +01:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(cpu_is_hotpluggable);
|
|
|
|
|
2012-01-10 04:04:32 +01:00
|
|
|
#ifdef CONFIG_GENERIC_CPU_DEVICES
|
|
|
|
static DEFINE_PER_CPU(struct cpu, cpu_devices);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void __init cpu_dev_register_generic(void)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_GENERIC_CPU_DEVICES
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for_each_possible_cpu(i) {
|
|
|
|
if (register_cpu(&per_cpu(cpu_devices, i), i))
|
|
|
|
panic("Failed to register CPU device");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2012-01-10 03:59:49 +01:00
|
|
|
void __init cpu_dev_init(void)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2012-01-10 03:59:49 +01:00
|
|
|
if (subsys_system_register(&cpu_subsys, cpu_root_attr_groups))
|
|
|
|
panic("Failed to register CPU subsystem");
|
2011-12-21 23:29:42 +01:00
|
|
|
|
2012-01-10 04:04:32 +01:00
|
|
|
cpu_dev_register_generic();
|
|
|
|
|
2006-06-27 11:54:42 +02:00
|
|
|
#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)
|
2012-01-10 03:59:49 +01:00
|
|
|
sched_create_sysfs_power_savings_entries(cpu_subsys.dev_root);
|
2006-06-27 11:54:42 +02:00
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|