The patch titled
node hotplug: register cpu: remove node struct
has been removed from the -mm tree. Its filename is
node-hotplug-register-cpu-remove-node-struct.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: node hotplug: register cpu: remove node struct
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxx: fix it]
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Cc: Ashok Raj <ashok.raj@xxxxxxxxx>
Cc: Dave Hansen <haveblue@xxxxxxxxxx>
Signed-off-by: Brice Goglin <Brice.Goglin@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/alpha/kernel/setup.c | 2 -
arch/arm/kernel/setup.c | 2 -
arch/i386/kernel/topology.c | 23 +++----------------
arch/ia64/kernel/topology.c | 17 +-------------
arch/m32r/kernel/setup.c | 2 -
arch/mips/kernel/smp.c | 2 -
arch/parisc/kernel/topology.c | 3 --
arch/powerpc/kernel/setup_32.c | 2 -
arch/powerpc/kernel/sysfs.c | 12 ----------
arch/ppc/kernel/setup.c | 2 -
arch/s390/kernel/smp.c | 2 -
arch/sh/kernel/setup.c | 2 -
arch/sh64/kernel/setup.c | 2 -
arch/sparc64/kernel/setup.c | 2 -
drivers/base/cpu.c | 18 ++++++---------
drivers/base/node.c | 36 +++++++++++++++++++++++++++++++
include/linux/cpu.h | 4 +--
include/linux/node.h | 13 +++++++++++
18 files changed, 77 insertions(+), 69 deletions(-)
diff -puN arch/alpha/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct arch/alpha/kernel/setup.c
--- a/arch/alpha/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/alpha/kernel/setup.c
@@ -481,7 +481,7 @@ register_cpus(void)
struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
if (!p)
return -ENOMEM;
- register_cpu(p, i, NULL);
+ register_cpu(p, i);
}
return 0;
}
diff -puN arch/arm/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct arch/arm/kernel/setup.c
--- a/arch/arm/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/arm/kernel/setup.c
@@ -808,7 +808,7 @@ static int __init topology_init(void)
int cpu;
for_each_possible_cpu(cpu)
- register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu, NULL);
+ register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu);
return 0;
}
diff -puN arch/i386/kernel/topology.c~node-hotplug-register-cpu-remove-node-struct arch/i386/kernel/topology.c
--- a/arch/i386/kernel/topology.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/i386/kernel/topology.c
@@ -32,15 +32,8 @@
static struct i386_cpu cpu_devices[NR_CPUS];
-int arch_register_cpu(int num){
- struct node *parent = NULL;
-
-#ifdef CONFIG_NUMA
- int node = cpu_to_node(num);
- if (node_online(node))
- parent = &node_devices[parent_node(node)];
-#endif /* CONFIG_NUMA */
-
+int arch_register_cpu(int num)
+{
/*
* CPU0 cannot be offlined due to several
* restrictions and assumptions in kernel. This basically
@@ -50,21 +43,13 @@ int arch_register_cpu(int num){
if (!num)
cpu_devices[num].cpu.no_control = 1;
- return register_cpu(&cpu_devices[num].cpu, num, parent);
+ return register_cpu(&cpu_devices[num].cpu, num);
}
#ifdef CONFIG_HOTPLUG_CPU
void arch_unregister_cpu(int num) {
- struct node *parent = NULL;
-
-#ifdef CONFIG_NUMA
- int node = cpu_to_node(num);
- if (node_online(node))
- parent = &node_devices[parent_node(node)];
-#endif /* CONFIG_NUMA */
-
- return unregister_cpu(&cpu_devices[num].cpu, parent);
+ return unregister_cpu(&cpu_devices[num].cpu);
}
EXPORT_SYMBOL(arch_register_cpu);
EXPORT_SYMBOL(arch_unregister_cpu);
diff -puN arch/ia64/kernel/topology.c~node-hotplug-register-cpu-remove-node-struct arch/ia64/kernel/topology.c
--- a/arch/ia64/kernel/topology.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/ia64/kernel/topology.c
@@ -30,12 +30,6 @@ static struct ia64_cpu *sysfs_cpus;
int arch_register_cpu(int num)
{
- struct node *parent = NULL;
-
-#ifdef CONFIG_NUMA
- parent = &node_devices[cpu_to_node(num)];
-#endif /* CONFIG_NUMA */
-
#if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)
/*
* If CPEI cannot be re-targetted, and this is
@@ -45,21 +39,14 @@ int arch_register_cpu(int num)
sysfs_cpus[num].cpu.no_control = 1;
#endif
- return register_cpu(&sysfs_cpus[num].cpu, num, parent);
+ return register_cpu(&sysfs_cpus[num].cpu, num);
}
#ifdef CONFIG_HOTPLUG_CPU
void arch_unregister_cpu(int num)
{
- struct node *parent = NULL;
-
-#ifdef CONFIG_NUMA
- int node = cpu_to_node(num);
- parent = &node_devices[node];
-#endif /* CONFIG_NUMA */
-
- return unregister_cpu(&sysfs_cpus[num].cpu, parent);
+ return unregister_cpu(&sysfs_cpus[num].cpu);
}
EXPORT_SYMBOL(arch_register_cpu);
EXPORT_SYMBOL(arch_unregister_cpu);
diff -puN arch/m32r/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct arch/m32r/kernel/setup.c
--- a/arch/m32r/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/m32r/kernel/setup.c
@@ -275,7 +275,7 @@ static int __init topology_init(void)
int i;
for_each_present_cpu(i)
- register_cpu(&cpu_devices[i], i, NULL);
+ register_cpu(&cpu_devices[i], i);
return 0;
}
diff -puN arch/mips/kernel/smp.c~node-hotplug-register-cpu-remove-node-struct arch/mips/kernel/smp.c
--- a/arch/mips/kernel/smp.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/mips/kernel/smp.c
@@ -446,7 +446,7 @@ static int __init topology_init(void)
int ret;
for_each_present_cpu(cpu) {
- ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL);
+ ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu);
if (ret)
printk(KERN_WARNING "topology_init: register_cpu %d "
"failed (%d)\n", cpu, ret);
diff -puN arch/parisc/kernel/topology.c~node-hotplug-register-cpu-remove-node-struct arch/parisc/kernel/topology.c
--- a/arch/parisc/kernel/topology.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/parisc/kernel/topology.c
@@ -26,11 +26,10 @@ static struct cpu cpu_devices[NR_CPUS] _
static int __init topology_init(void)
{
- struct node *parent = NULL;
int num;
for_each_present_cpu(num) {
- register_cpu(&cpu_devices[num], num, parent);
+ register_cpu(&cpu_devices[num], num);
}
return 0;
}
diff -puN arch/powerpc/kernel/setup_32.c~node-hotplug-register-cpu-remove-node-struct arch/powerpc/kernel/setup_32.c
--- a/arch/powerpc/kernel/setup_32.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/powerpc/kernel/setup_32.c
@@ -215,7 +215,7 @@ int __init ppc_init(void)
/* register CPU devices */
for_each_possible_cpu(i)
- register_cpu(&cpu_devices[i], i, NULL);
+ register_cpu(&cpu_devices[i], i);
/* call platform init */
if (ppc_md.init != NULL) {
diff -puN arch/powerpc/kernel/sysfs.c~node-hotplug-register-cpu-remove-node-struct arch/powerpc/kernel/sysfs.c
--- a/arch/powerpc/kernel/sysfs.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/powerpc/kernel/sysfs.c
@@ -348,23 +348,13 @@ static SYSDEV_ATTR(physical_id, 0444, sh
static int __init topology_init(void)
{
int cpu;
- struct node *parent = NULL;
register_nodes();
-
register_cpu_notifier(&sysfs_cpu_nb);
for_each_possible_cpu(cpu) {
struct cpu *c = &per_cpu(cpu_devices, cpu);
-#ifdef CONFIG_NUMA
- /* The node to which a cpu belongs can't be known
- * until the cpu is made present.
- */
- parent = NULL;
- if (cpu_present(cpu))
- parent = &node_devices[cpu_to_node(cpu)];
-#endif
/*
* For now, we just see if the system supports making
* the RTAS calls for CPU hotplug. But, there may be a
@@ -376,7 +366,7 @@ static int __init topology_init(void)
c->no_control = 1;
if (cpu_online(cpu) || (c->no_control == 0)) {
- register_cpu(c, cpu, parent);
+ register_cpu(c, cpu);
sysdev_create_file(&c->sysdev, &attr_physical_id);
}
diff -puN arch/ppc/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct arch/ppc/kernel/setup.c
--- a/arch/ppc/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/ppc/kernel/setup.c
@@ -475,7 +475,7 @@ int __init ppc_init(void)
/* register CPU devices */
for_each_possible_cpu(i)
- register_cpu(&cpu_devices[i], i, NULL);
+ register_cpu(&cpu_devices[i], i);
/* call platform init */
if (ppc_md.init != NULL) {
diff -puN arch/s390/kernel/smp.c~node-hotplug-register-cpu-remove-node-struct arch/s390/kernel/smp.c
--- a/arch/s390/kernel/smp.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/s390/kernel/smp.c
@@ -869,7 +869,7 @@ static int __init topology_init(void)
int ret;
for_each_possible_cpu(cpu) {
- ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL);
+ ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu);
if (ret)
printk(KERN_WARNING "topology_init: register_cpu %d "
"failed (%d)\n", cpu, ret);
diff -puN arch/sh64/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct arch/sh64/kernel/setup.c
--- a/arch/sh64/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/sh64/kernel/setup.c
@@ -309,7 +309,7 @@ static struct cpu cpu[1];
static int __init topology_init(void)
{
- return register_cpu(cpu, 0, NULL);
+ return register_cpu(cpu, 0);
}
subsys_initcall(topology_init);
diff -puN arch/sh/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct arch/sh/kernel/setup.c
--- a/arch/sh/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/sh/kernel/setup.c
@@ -402,7 +402,7 @@ static int __init topology_init(void)
int cpu_id;
for_each_possible_cpu(cpu_id)
- register_cpu(&cpu[cpu_id], cpu_id, NULL);
+ register_cpu(&cpu[cpu_id], cpu_id);
return 0;
}
diff -puN arch/sparc64/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct arch/sparc64/kernel/setup.c
--- a/arch/sparc64/kernel/setup.c~node-hotplug-register-cpu-remove-node-struct
+++ a/arch/sparc64/kernel/setup.c
@@ -537,7 +537,7 @@ static int __init topology_init(void)
for_each_possible_cpu(i) {
struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
if (p) {
- register_cpu(p, i, NULL);
+ register_cpu(p, i);
err = 0;
}
}
diff -puN drivers/base/cpu.c~node-hotplug-register-cpu-remove-node-struct drivers/base/cpu.c
--- a/drivers/base/cpu.c~node-hotplug-register-cpu-remove-node-struct
+++ a/drivers/base/cpu.c
@@ -8,6 +8,7 @@
#include <linux/cpu.h>
#include <linux/topology.h>
#include <linux/device.h>
+#include <linux/node.h>
#include "base.h"
@@ -57,13 +58,12 @@ static void __devinit register_cpu_contr
{
sysdev_create_file(&cpu->sysdev, &attr_online);
}
-void unregister_cpu(struct cpu *cpu, struct node *root)
+void unregister_cpu(struct cpu *cpu)
{
int logical_cpu = cpu->sysdev.id;
- if (root)
- sysfs_remove_link(&root->sysdev.kobj,
- kobject_name(&cpu->sysdev.kobj));
+ unregister_cpu_under_node(logical_cpu, cpu_to_node(logical_cpu));
+
sysdev_remove_file(&cpu->sysdev, &attr_online);
sysdev_unregister(&cpu->sysdev);
@@ -109,23 +109,21 @@ static SYSDEV_ATTR(crash_notes, 0400, sh
*
* Initialize and register the CPU device.
*/
-int __devinit register_cpu(struct cpu *cpu, int num, struct node *root)
+int __devinit register_cpu(struct cpu *cpu, int num)
{
int error;
-
cpu->node_id = cpu_to_node(num);
cpu->sysdev.id = num;
cpu->sysdev.cls = &cpu_sysdev_class;
error = sysdev_register(&cpu->sysdev);
- if (!error && root)
- error = sysfs_create_link(&root->sysdev.kobj,
- &cpu->sysdev.kobj,
- kobject_name(&cpu->sysdev.kobj));
+
if (!error && !cpu->no_control)
register_cpu_control(cpu);
if (!error)
cpu_sys_devices[num] = &cpu->sysdev;
+ if (!error)
+ register_cpu_under_node(num, cpu_to_node(num));
#ifdef CONFIG_KEXEC
if (!error)
diff -puN drivers/base/node.c~node-hotplug-register-cpu-remove-node-struct drivers/base/node.c
--- a/drivers/base/node.c~node-hotplug-register-cpu-remove-node-struct
+++ a/drivers/base/node.c
@@ -11,6 +11,7 @@
#include <linux/cpumask.h>
#include <linux/topology.h>
#include <linux/nodemask.h>
+#include <linux/cpu.h>
static struct sysdev_class node_class = {
set_kset_name("node"),
@@ -192,9 +193,38 @@ void unregister_node(struct node *node)
struct node node_devices[MAX_NUMNODES];
+/*
+ * register cpu under node
+ */
+int register_cpu_under_node(unsigned int cpu, unsigned int nid)
+{
+ if (node_online(nid)) {
+ struct sys_device *obj = get_cpu_sysdev(cpu);
+ if (!obj)
+ return 0;
+ return sysfs_create_link(&node_devices[nid].sysdev.kobj,
+ &obj->kobj,
+ kobject_name(&obj->kobj));
+ }
+
+ return 0;
+}
+
+int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
+{
+ if (node_online(nid)) {
+ struct sys_device *obj = get_cpu_sysdev(cpu);
+ if (obj)
+ sysfs_remove_link(&node_devices[nid].sysdev.kobj,
+ kobject_name(&obj->kobj));
+ }
+ return 0;
+}
+
int register_one_node(int nid)
{
int error = 0;
+ int cpu;
if (node_online(nid)) {
int p_node = parent_node(nid);
@@ -204,6 +234,12 @@ int register_one_node(int nid)
parent = &node_devices[p_node];
error = register_node(&node_devices[nid], nid, parent);
+
+ /* link cpu under this node */
+ for_each_present_cpu(cpu) {
+ if (cpu_to_node(cpu) == nid)
+ register_cpu_under_node(cpu, nid);
+ }
}
return error;
diff -puN include/linux/cpu.h~node-hotplug-register-cpu-remove-node-struct include/linux/cpu.h
--- a/include/linux/cpu.h~node-hotplug-register-cpu-remove-node-struct
+++ a/include/linux/cpu.h
@@ -31,10 +31,10 @@ struct cpu {
struct sys_device sysdev;
};
-extern int register_cpu(struct cpu *, int, struct node *);
+extern int register_cpu(struct cpu *cpu, int num);
extern struct sys_device *get_cpu_sysdev(unsigned cpu);
#ifdef CONFIG_HOTPLUG_CPU
-extern void unregister_cpu(struct cpu *, struct node *);
+extern void unregister_cpu(struct cpu *cpu);
#endif
struct notifier_block;
diff -puN include/linux/node.h~node-hotplug-register-cpu-remove-node-struct include/linux/node.h
--- a/include/linux/node.h~node-hotplug-register-cpu-remove-node-struct
+++ a/include/linux/node.h
@@ -32,6 +32,19 @@ extern int register_node(struct node *,
extern void unregister_node(struct node *node);
extern int register_one_node(int nid);
extern void unregister_one_node(int nid);
+#ifdef CONFIG_NUMA
+extern int register_cpu_under_node(unsigned int cpu, unsigned int nid);
+extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);
+#else
+static inline int register_cpu_under_node(unsigned int cpu, unsigned int nid)
+{
+ return 0;
+}
+static inline int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
+{
+ return 0;
+}
+#endif
#define to_node(sys_device) container_of(sys_device, struct node, sysdev)
_
Patches currently in -mm which might be from kamezawa.hiroyu@xxxxxxxxxxxxxx are
origin.patch
remove-empty-node-at-boot-time.patch
namespaces-utsname-sysctl-hack-cleanup-2-fix.patch
reiser4-hardirq-include-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
