2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* drivers/base/node.c - basic Node class support
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/sysdev.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/node.h>
|
|
|
|
#include <linux/hugetlb.h>
|
|
|
|
#include <linux/cpumask.h>
|
|
|
|
#include <linux/topology.h>
|
|
|
|
#include <linux/nodemask.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/cpu.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
static struct sysdev_class node_class = {
|
|
|
|
set_kset_name("node"),
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static ssize_t node_read_cpumap(struct sys_device * dev, char * buf)
|
|
|
|
{
|
|
|
|
struct node *node_dev = to_node(dev);
|
|
|
|
cpumask_t mask = node_to_cpumask(node_dev->sysdev.id);
|
|
|
|
int len;
|
|
|
|
|
|
|
|
/* 2004/06/03: buf currently PAGE_SIZE, need > 1 char per 4 bits. */
|
|
|
|
BUILD_BUG_ON(MAX_NUMNODES/4 > PAGE_SIZE/2);
|
|
|
|
|
|
|
|
len = cpumask_scnprintf(buf, PAGE_SIZE-1, mask);
|
|
|
|
len += sprintf(buf + len, "\n");
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static SYSDEV_ATTR(cpumap, S_IRUGO, node_read_cpumap, NULL);
|
|
|
|
|
|
|
|
#define K(x) ((x) << (PAGE_SHIFT - 10))
|
|
|
|
static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
int nid = dev->id;
|
|
|
|
struct sysinfo i;
|
2005-09-04 00:55:11 +02:00
|
|
|
struct page_state ps;
|
2005-04-17 00:20:36 +02:00
|
|
|
unsigned long inactive;
|
|
|
|
unsigned long active;
|
|
|
|
unsigned long free;
|
|
|
|
|
|
|
|
si_meminfo_node(&i, nid);
|
2005-09-04 00:55:11 +02:00
|
|
|
get_page_state_node(&ps, nid);
|
2005-04-17 00:20:36 +02:00
|
|
|
__get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
|
|
|
|
|
2005-09-04 00:55:11 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
n = sprintf(buf, "\n"
|
|
|
|
"Node %d MemTotal: %8lu kB\n"
|
|
|
|
"Node %d MemFree: %8lu kB\n"
|
|
|
|
"Node %d MemUsed: %8lu kB\n"
|
|
|
|
"Node %d Active: %8lu kB\n"
|
|
|
|
"Node %d Inactive: %8lu kB\n"
|
|
|
|
"Node %d HighTotal: %8lu kB\n"
|
|
|
|
"Node %d HighFree: %8lu kB\n"
|
|
|
|
"Node %d LowTotal: %8lu kB\n"
|
2005-09-04 00:55:11 +02:00
|
|
|
"Node %d LowFree: %8lu kB\n"
|
|
|
|
"Node %d Dirty: %8lu kB\n"
|
|
|
|
"Node %d Writeback: %8lu kB\n"
|
2006-06-30 10:55:35 +02:00
|
|
|
"Node %d FilePages: %8lu kB\n"
|
2005-09-04 00:55:11 +02:00
|
|
|
"Node %d Mapped: %8lu kB\n"
|
2006-06-30 10:55:36 +02:00
|
|
|
"Node %d AnonPages: %8lu kB\n"
|
2006-06-30 10:55:38 +02:00
|
|
|
"Node %d PageTables: %8lu kB\n"
|
2005-09-04 00:55:11 +02:00
|
|
|
"Node %d Slab: %8lu kB\n",
|
2005-04-17 00:20:36 +02:00
|
|
|
nid, K(i.totalram),
|
|
|
|
nid, K(i.freeram),
|
|
|
|
nid, K(i.totalram - i.freeram),
|
|
|
|
nid, K(active),
|
|
|
|
nid, K(inactive),
|
|
|
|
nid, K(i.totalhigh),
|
|
|
|
nid, K(i.freehigh),
|
|
|
|
nid, K(i.totalram - i.totalhigh),
|
2005-09-04 00:55:11 +02:00
|
|
|
nid, K(i.freeram - i.freehigh),
|
2006-06-30 10:55:39 +02:00
|
|
|
nid, K(node_page_state(nid, NR_FILE_DIRTY)),
|
2006-06-30 10:55:40 +02:00
|
|
|
nid, K(node_page_state(nid, NR_WRITEBACK)),
|
2006-06-30 10:55:35 +02:00
|
|
|
nid, K(node_page_state(nid, NR_FILE_PAGES)),
|
2006-06-30 10:55:34 +02:00
|
|
|
nid, K(node_page_state(nid, NR_FILE_MAPPED)),
|
2006-06-30 10:55:36 +02:00
|
|
|
nid, K(node_page_state(nid, NR_ANON_PAGES)),
|
2006-06-30 10:55:38 +02:00
|
|
|
nid, K(node_page_state(nid, NR_PAGETABLE)),
|
2006-06-30 10:55:38 +02:00
|
|
|
nid, K(node_page_state(nid, NR_SLAB)));
|
2005-04-17 00:20:36 +02:00
|
|
|
n += hugetlb_report_node_meminfo(nid, buf + n);
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef K
|
|
|
|
static SYSDEV_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL);
|
|
|
|
|
|
|
|
static ssize_t node_read_numastat(struct sys_device * dev, char * buf)
|
|
|
|
{
|
|
|
|
unsigned long numa_hit, numa_miss, interleave_hit, numa_foreign;
|
|
|
|
unsigned long local_node, other_node;
|
|
|
|
int i, cpu;
|
|
|
|
pg_data_t *pg = NODE_DATA(dev->id);
|
|
|
|
numa_hit = 0;
|
|
|
|
numa_miss = 0;
|
|
|
|
interleave_hit = 0;
|
|
|
|
numa_foreign = 0;
|
|
|
|
local_node = 0;
|
|
|
|
other_node = 0;
|
|
|
|
for (i = 0; i < MAX_NR_ZONES; i++) {
|
|
|
|
struct zone *z = &pg->node_zones[i];
|
2006-04-11 07:52:47 +02:00
|
|
|
for_each_online_cpu(cpu) {
|
2005-06-22 02:14:47 +02:00
|
|
|
struct per_cpu_pageset *ps = zone_pcp(z,cpu);
|
2005-04-17 00:20:36 +02:00
|
|
|
numa_hit += ps->numa_hit;
|
|
|
|
numa_miss += ps->numa_miss;
|
|
|
|
numa_foreign += ps->numa_foreign;
|
|
|
|
interleave_hit += ps->interleave_hit;
|
|
|
|
local_node += ps->local_node;
|
|
|
|
other_node += ps->other_node;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return sprintf(buf,
|
|
|
|
"numa_hit %lu\n"
|
|
|
|
"numa_miss %lu\n"
|
|
|
|
"numa_foreign %lu\n"
|
|
|
|
"interleave_hit %lu\n"
|
|
|
|
"local_node %lu\n"
|
|
|
|
"other_node %lu\n",
|
|
|
|
numa_hit,
|
|
|
|
numa_miss,
|
|
|
|
numa_foreign,
|
|
|
|
interleave_hit,
|
|
|
|
local_node,
|
|
|
|
other_node);
|
|
|
|
}
|
|
|
|
static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);
|
|
|
|
|
|
|
|
static ssize_t node_read_distance(struct sys_device * dev, char * buf)
|
|
|
|
{
|
|
|
|
int nid = dev->id;
|
|
|
|
int len = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* buf currently PAGE_SIZE, need ~4 chars per node */
|
|
|
|
BUILD_BUG_ON(MAX_NUMNODES*4 > PAGE_SIZE/2);
|
|
|
|
|
|
|
|
for_each_online_node(i)
|
|
|
|
len += sprintf(buf + len, "%s%d", i ? " " : "", node_distance(nid, i));
|
|
|
|
|
|
|
|
len += sprintf(buf + len, "\n");
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
static SYSDEV_ATTR(distance, S_IRUGO, node_read_distance, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* register_node - Setup a driverfs device for a node.
|
|
|
|
* @num - Node number to use when creating the device.
|
|
|
|
*
|
|
|
|
* Initialize and register the node device.
|
|
|
|
*/
|
2005-05-08 14:28:53 +02:00
|
|
|
int register_node(struct node *node, int num, struct node *parent)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
int error;
|
|
|
|
|
|
|
|
node->sysdev.id = num;
|
|
|
|
node->sysdev.cls = &node_class;
|
|
|
|
error = sysdev_register(&node->sysdev);
|
|
|
|
|
|
|
|
if (!error){
|
|
|
|
sysdev_create_file(&node->sysdev, &attr_cpumap);
|
|
|
|
sysdev_create_file(&node->sysdev, &attr_meminfo);
|
|
|
|
sysdev_create_file(&node->sysdev, &attr_numastat);
|
|
|
|
sysdev_create_file(&node->sysdev, &attr_distance);
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2005-05-08 14:28:53 +02:00
|
|
|
/**
|
|
|
|
* unregister_node - unregister a node device
|
|
|
|
* @node: node going away
|
|
|
|
*
|
|
|
|
* Unregisters a node device @node. All the devices on the node must be
|
|
|
|
* unregistered before calling this function.
|
|
|
|
*/
|
|
|
|
void unregister_node(struct node *node)
|
|
|
|
{
|
|
|
|
sysdev_remove_file(&node->sysdev, &attr_cpumap);
|
|
|
|
sysdev_remove_file(&node->sysdev, &attr_meminfo);
|
|
|
|
sysdev_remove_file(&node->sysdev, &attr_numastat);
|
|
|
|
sysdev_remove_file(&node->sysdev, &attr_distance);
|
|
|
|
|
|
|
|
sysdev_unregister(&node->sysdev);
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-06-27 11:53:38 +02:00
|
|
|
struct node node_devices[MAX_NUMNODES];
|
|
|
|
|
[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
|
|
|
/*
|
|
|
|
* 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;
|
|
|
|
}
|
|
|
|
|
2006-06-27 11:53:38 +02:00
|
|
|
int register_one_node(int nid)
|
|
|
|
{
|
|
|
|
int error = 0;
|
[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
|
|
|
int cpu;
|
2006-06-27 11:53:38 +02:00
|
|
|
|
|
|
|
if (node_online(nid)) {
|
|
|
|
int p_node = parent_node(nid);
|
|
|
|
struct node *parent = NULL;
|
|
|
|
|
|
|
|
if (p_node != nid)
|
|
|
|
parent = &node_devices[p_node];
|
|
|
|
|
|
|
|
error = register_node(&node_devices[nid], nid, parent);
|
[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
|
|
|
|
|
|
|
/* link cpu under this node */
|
|
|
|
for_each_present_cpu(cpu) {
|
|
|
|
if (cpu_to_node(cpu) == nid)
|
|
|
|
register_cpu_under_node(cpu, nid);
|
|
|
|
}
|
2006-06-27 11:53:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void unregister_one_node(int nid)
|
|
|
|
{
|
|
|
|
unregister_node(&node_devices[nid]);
|
|
|
|
}
|
|
|
|
|
2005-05-08 14:28:53 +02:00
|
|
|
static int __init register_node_type(void)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
return sysdev_class_register(&node_class);
|
|
|
|
}
|
|
|
|
postcore_initcall(register_node_type);
|