2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2011-12-22 06:48:43 +08:00
|
|
|
* Basic Node interface support
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/mm.h>
|
2009-01-07 06:39:14 +08:00
|
|
|
#include <linux/memory.h>
|
2011-05-25 08:11:28 +08:00
|
|
|
#include <linux/vmstat.h>
|
2013-04-30 06:08:07 +08:00
|
|
|
#include <linux/notifier.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/node.h>
|
|
|
|
#include <linux/hugetlb.h>
|
2010-05-25 05:32:29 +08:00
|
|
|
#include <linux/compaction.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#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 17:53:41 +08:00
|
|
|
#include <linux/cpu.h>
|
2007-10-16 16:26:27 +08:00
|
|
|
#include <linux/device.h>
|
2008-10-19 11:26:53 +08:00
|
|
|
#include <linux/swap.h>
|
2010-04-06 18:23:33 +08:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
static struct bus_type node_subsys = {
|
2007-12-20 09:09:39 +08:00
|
|
|
.name = "node",
|
2011-12-22 06:48:43 +08:00
|
|
|
.dev_name = "node",
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
static ssize_t node_read_cpumap(struct device *dev, int type, char *buf)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct node *node_dev = to_node(dev);
|
2011-12-22 06:48:43 +08:00
|
|
|
const struct cpumask *mask = cpumask_of_node(node_dev->dev.id);
|
2005-04-17 06:20:36 +08:00
|
|
|
int len;
|
|
|
|
|
2008-04-09 02:43:03 +08:00
|
|
|
/* 2008/04/07: buf currently PAGE_SIZE, need 9 chars per 32 bits. */
|
|
|
|
BUILD_BUG_ON((NR_CPUS/32 * 9) > (PAGE_SIZE-1));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-04-09 02:43:03 +08:00
|
|
|
len = type?
|
2008-12-13 18:50:25 +08:00
|
|
|
cpulist_scnprintf(buf, PAGE_SIZE-2, mask) :
|
|
|
|
cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
|
2008-04-05 09:11:10 +08:00
|
|
|
buf[len++] = '\n';
|
|
|
|
buf[len] = '\0';
|
2005-04-17 06:20:36 +08:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
static inline ssize_t node_read_cpumask(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2008-04-09 02:43:03 +08:00
|
|
|
{
|
|
|
|
return node_read_cpumap(dev, 0, buf);
|
|
|
|
}
|
2011-12-22 06:48:43 +08:00
|
|
|
static inline ssize_t node_read_cpulist(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2008-04-09 02:43:03 +08:00
|
|
|
{
|
|
|
|
return node_read_cpumap(dev, 1, buf);
|
|
|
|
}
|
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
static DEVICE_ATTR(cpumap, S_IRUGO, node_read_cpumask, NULL);
|
|
|
|
static DEVICE_ATTR(cpulist, S_IRUGO, node_read_cpulist, NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#define K(x) ((x) << (PAGE_SHIFT - 10))
|
2011-12-22 06:48:43 +08:00
|
|
|
static ssize_t node_read_meminfo(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int n;
|
|
|
|
int nid = dev->id;
|
|
|
|
struct sysinfo i;
|
|
|
|
|
|
|
|
si_meminfo_node(&i, nid);
|
2010-08-10 08:19:50 +08:00
|
|
|
n = sprintf(buf,
|
2008-10-19 11:26:32 +08:00
|
|
|
"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 Active(anon): %8lu kB\n"
|
|
|
|
"Node %d Inactive(anon): %8lu kB\n"
|
|
|
|
"Node %d Active(file): %8lu kB\n"
|
|
|
|
"Node %d Inactive(file): %8lu kB\n"
|
2008-10-19 11:26:51 +08:00
|
|
|
"Node %d Unevictable: %8lu kB\n"
|
2010-08-10 08:19:50 +08:00
|
|
|
"Node %d Mlocked: %8lu kB\n",
|
|
|
|
nid, K(i.totalram),
|
|
|
|
nid, K(i.freeram),
|
|
|
|
nid, K(i.totalram - i.freeram),
|
|
|
|
nid, K(node_page_state(nid, NR_ACTIVE_ANON) +
|
|
|
|
node_page_state(nid, NR_ACTIVE_FILE)),
|
|
|
|
nid, K(node_page_state(nid, NR_INACTIVE_ANON) +
|
|
|
|
node_page_state(nid, NR_INACTIVE_FILE)),
|
|
|
|
nid, K(node_page_state(nid, NR_ACTIVE_ANON)),
|
|
|
|
nid, K(node_page_state(nid, NR_INACTIVE_ANON)),
|
|
|
|
nid, K(node_page_state(nid, NR_ACTIVE_FILE)),
|
|
|
|
nid, K(node_page_state(nid, NR_INACTIVE_FILE)),
|
|
|
|
nid, K(node_page_state(nid, NR_UNEVICTABLE)),
|
|
|
|
nid, K(node_page_state(nid, NR_MLOCK)));
|
|
|
|
|
2006-09-26 14:31:10 +08:00
|
|
|
#ifdef CONFIG_HIGHMEM
|
2010-08-10 08:19:50 +08:00
|
|
|
n += sprintf(buf + n,
|
2008-10-19 11:26:32 +08:00
|
|
|
"Node %d HighTotal: %8lu kB\n"
|
|
|
|
"Node %d HighFree: %8lu kB\n"
|
|
|
|
"Node %d LowTotal: %8lu kB\n"
|
2010-08-10 08:19:50 +08:00
|
|
|
"Node %d LowFree: %8lu kB\n",
|
|
|
|
nid, K(i.totalhigh),
|
|
|
|
nid, K(i.freehigh),
|
|
|
|
nid, K(i.totalram - i.totalhigh),
|
|
|
|
nid, K(i.freeram - i.freehigh));
|
2006-09-26 14:31:10 +08:00
|
|
|
#endif
|
2010-08-10 08:19:50 +08:00
|
|
|
n += sprintf(buf + n,
|
2008-10-19 11:26:32 +08:00
|
|
|
"Node %d Dirty: %8lu kB\n"
|
|
|
|
"Node %d Writeback: %8lu kB\n"
|
|
|
|
"Node %d FilePages: %8lu kB\n"
|
|
|
|
"Node %d Mapped: %8lu kB\n"
|
|
|
|
"Node %d AnonPages: %8lu kB\n"
|
2009-09-22 08:01:33 +08:00
|
|
|
"Node %d Shmem: %8lu kB\n"
|
2009-09-22 08:01:32 +08:00
|
|
|
"Node %d KernelStack: %8lu kB\n"
|
2008-10-19 11:26:32 +08:00
|
|
|
"Node %d PageTables: %8lu kB\n"
|
|
|
|
"Node %d NFS_Unstable: %8lu kB\n"
|
|
|
|
"Node %d Bounce: %8lu kB\n"
|
|
|
|
"Node %d WritebackTmp: %8lu kB\n"
|
|
|
|
"Node %d Slab: %8lu kB\n"
|
|
|
|
"Node %d SReclaimable: %8lu kB\n"
|
2011-01-14 07:47:14 +08:00
|
|
|
"Node %d SUnreclaim: %8lu kB\n"
|
|
|
|
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
|
|
|
"Node %d AnonHugePages: %8lu kB\n"
|
|
|
|
#endif
|
|
|
|
,
|
2006-06-30 16:55:39 +08:00
|
|
|
nid, K(node_page_state(nid, NR_FILE_DIRTY)),
|
2006-06-30 16:55:40 +08:00
|
|
|
nid, K(node_page_state(nid, NR_WRITEBACK)),
|
2006-06-30 16:55:35 +08:00
|
|
|
nid, K(node_page_state(nid, NR_FILE_PAGES)),
|
2006-06-30 16:55:34 +08:00
|
|
|
nid, K(node_page_state(nid, NR_FILE_MAPPED)),
|
2011-11-17 18:08:32 +08:00
|
|
|
nid, K(node_page_state(nid, NR_ANON_PAGES)),
|
2014-08-07 07:06:38 +08:00
|
|
|
nid, K(i.sharedram),
|
2009-09-22 08:01:32 +08:00
|
|
|
nid, node_page_state(nid, NR_KERNEL_STACK) *
|
|
|
|
THREAD_SIZE / 1024,
|
2006-06-30 16:55:38 +08:00
|
|
|
nid, K(node_page_state(nid, NR_PAGETABLE)),
|
2006-06-30 16:55:40 +08:00
|
|
|
nid, K(node_page_state(nid, NR_UNSTABLE_NFS)),
|
2006-06-30 16:55:41 +08:00
|
|
|
nid, K(node_page_state(nid, NR_BOUNCE)),
|
2008-04-30 15:54:38 +08:00
|
|
|
nid, K(node_page_state(nid, NR_WRITEBACK_TEMP)),
|
2006-09-26 14:31:51 +08:00
|
|
|
nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE) +
|
|
|
|
node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
|
|
|
|
nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),
|
2011-01-14 07:47:14 +08:00
|
|
|
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
2011-11-17 18:08:32 +08:00
|
|
|
nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))
|
2011-01-14 07:47:14 +08:00
|
|
|
, nid,
|
|
|
|
K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
|
2011-11-17 18:08:32 +08:00
|
|
|
HPAGE_PMD_NR));
|
|
|
|
#else
|
|
|
|
nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));
|
2011-01-14 07:47:14 +08:00
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
n += hugetlb_report_node_meminfo(nid, buf + n);
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef K
|
2011-12-22 06:48:43 +08:00
|
|
|
static DEVICE_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
static ssize_t node_read_numastat(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
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",
|
2006-06-30 16:55:44 +08:00
|
|
|
node_page_state(dev->id, NUMA_HIT),
|
|
|
|
node_page_state(dev->id, NUMA_MISS),
|
|
|
|
node_page_state(dev->id, NUMA_FOREIGN),
|
|
|
|
node_page_state(dev->id, NUMA_INTERLEAVE_HIT),
|
|
|
|
node_page_state(dev->id, NUMA_LOCAL),
|
|
|
|
node_page_state(dev->id, NUMA_OTHER));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2011-12-22 06:48:43 +08:00
|
|
|
static DEVICE_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
static ssize_t node_read_vmstat(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2010-10-27 05:21:35 +08:00
|
|
|
{
|
|
|
|
int nid = dev->id;
|
2011-05-25 08:11:28 +08:00
|
|
|
int i;
|
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
|
|
|
|
n += sprintf(buf+n, "%s %lu\n", vmstat_text[i],
|
|
|
|
node_page_state(nid, i));
|
|
|
|
|
|
|
|
return n;
|
2010-10-27 05:21:35 +08:00
|
|
|
}
|
2011-12-22 06:48:43 +08:00
|
|
|
static DEVICE_ATTR(vmstat, S_IRUGO, node_read_vmstat, NULL);
|
2010-10-27 05:21:35 +08:00
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
static ssize_t node_read_distance(struct device *dev,
|
|
|
|
struct device_attribute *attr, char * buf)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int nid = dev->id;
|
|
|
|
int len = 0;
|
|
|
|
int i;
|
|
|
|
|
2010-03-11 06:50:21 +08:00
|
|
|
/*
|
|
|
|
* buf is currently PAGE_SIZE in length and each node needs 4 chars
|
|
|
|
* at the most (distance + space or newline).
|
|
|
|
*/
|
|
|
|
BUILD_BUG_ON(MAX_NUMNODES * 4 > PAGE_SIZE);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
for_each_online_node(i)
|
|
|
|
len += sprintf(buf + len, "%s%d", i ? " " : "", node_distance(nid, i));
|
|
|
|
|
|
|
|
len += sprintf(buf + len, "\n");
|
|
|
|
return len;
|
|
|
|
}
|
2011-12-22 06:48:43 +08:00
|
|
|
static DEVICE_ATTR(distance, S_IRUGO, node_read_distance, NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-12-15 09:58:25 +08:00
|
|
|
#ifdef CONFIG_HUGETLBFS
|
|
|
|
/*
|
|
|
|
* hugetlbfs per node attributes registration interface:
|
|
|
|
* When/if hugetlb[fs] subsystem initializes [sometime after this module],
|
2009-12-15 09:58:35 +08:00
|
|
|
* it will register its per node attributes for all online nodes with
|
|
|
|
* memory. It will also call register_hugetlbfs_with_node(), below, to
|
2009-12-15 09:58:25 +08:00
|
|
|
* register its attribute registration functions with this node driver.
|
|
|
|
* Once these hooks have been initialized, the node driver will call into
|
|
|
|
* the hugetlb module to [un]register attributes for hot-plugged nodes.
|
|
|
|
*/
|
|
|
|
static node_registration_func_t __hugetlb_register_node;
|
|
|
|
static node_registration_func_t __hugetlb_unregister_node;
|
|
|
|
|
2009-12-15 09:58:36 +08:00
|
|
|
static inline bool hugetlb_register_node(struct node *node)
|
2009-12-15 09:58:25 +08:00
|
|
|
{
|
2009-12-15 09:58:35 +08:00
|
|
|
if (__hugetlb_register_node &&
|
2012-12-13 05:51:36 +08:00
|
|
|
node_state(node->dev.id, N_MEMORY)) {
|
2009-12-15 09:58:25 +08:00
|
|
|
__hugetlb_register_node(node);
|
2009-12-15 09:58:36 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
2009-12-15 09:58:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void hugetlb_unregister_node(struct node *node)
|
|
|
|
{
|
|
|
|
if (__hugetlb_unregister_node)
|
|
|
|
__hugetlb_unregister_node(node);
|
|
|
|
}
|
|
|
|
|
|
|
|
void register_hugetlbfs_with_node(node_registration_func_t doregister,
|
|
|
|
node_registration_func_t unregister)
|
|
|
|
{
|
|
|
|
__hugetlb_register_node = doregister;
|
|
|
|
__hugetlb_unregister_node = unregister;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void hugetlb_register_node(struct node *node) {}
|
|
|
|
|
|
|
|
static inline void hugetlb_unregister_node(struct node *node) {}
|
|
|
|
#endif
|
|
|
|
|
2012-12-12 08:00:57 +08:00
|
|
|
static void node_device_release(struct device *dev)
|
|
|
|
{
|
|
|
|
struct node *node = to_node(dev);
|
|
|
|
|
|
|
|
#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HUGETLBFS)
|
|
|
|
/*
|
|
|
|
* We schedule the work only when a memory section is
|
|
|
|
* onlined/offlined on this node. When we come here,
|
|
|
|
* all the memory on this node has been offlined,
|
|
|
|
* so we won't enqueue new work to this work.
|
|
|
|
*
|
|
|
|
* The work is using node->node_work, so we should
|
|
|
|
* flush work before freeing the memory.
|
|
|
|
*/
|
|
|
|
flush_work(&node->node_work);
|
|
|
|
#endif
|
|
|
|
kfree(node);
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
2007-02-18 02:13:42 +08:00
|
|
|
* register_node - Setup a sysfs device for a node.
|
2005-04-17 06:20:36 +08:00
|
|
|
* @num - Node number to use when creating the device.
|
|
|
|
*
|
|
|
|
* Initialize and register the node device.
|
|
|
|
*/
|
2012-12-12 08:02:52 +08:00
|
|
|
static int register_node(struct node *node, int num, struct node *parent)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int error;
|
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
node->dev.id = num;
|
|
|
|
node->dev.bus = &node_subsys;
|
2012-12-12 08:00:57 +08:00
|
|
|
node->dev.release = node_device_release;
|
2011-12-22 06:48:43 +08:00
|
|
|
error = device_register(&node->dev);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (!error){
|
2011-12-22 06:48:43 +08:00
|
|
|
device_create_file(&node->dev, &dev_attr_cpumap);
|
|
|
|
device_create_file(&node->dev, &dev_attr_cpulist);
|
|
|
|
device_create_file(&node->dev, &dev_attr_meminfo);
|
|
|
|
device_create_file(&node->dev, &dev_attr_numastat);
|
|
|
|
device_create_file(&node->dev, &dev_attr_distance);
|
|
|
|
device_create_file(&node->dev, &dev_attr_vmstat);
|
2008-10-19 11:26:53 +08:00
|
|
|
|
2009-12-15 09:58:25 +08:00
|
|
|
hugetlb_register_node(node);
|
2010-05-25 05:32:29 +08:00
|
|
|
|
|
|
|
compaction_register_node(node);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2005-05-08 20:28:53 +08: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)
|
|
|
|
{
|
2011-12-22 06:48:43 +08:00
|
|
|
device_remove_file(&node->dev, &dev_attr_cpumap);
|
|
|
|
device_remove_file(&node->dev, &dev_attr_cpulist);
|
|
|
|
device_remove_file(&node->dev, &dev_attr_meminfo);
|
|
|
|
device_remove_file(&node->dev, &dev_attr_numastat);
|
|
|
|
device_remove_file(&node->dev, &dev_attr_distance);
|
|
|
|
device_remove_file(&node->dev, &dev_attr_vmstat);
|
2005-05-08 20:28:53 +08:00
|
|
|
|
2009-12-15 09:58:35 +08:00
|
|
|
hugetlb_unregister_node(node); /* no-op, if memoryless node */
|
2008-10-19 11:26:53 +08:00
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
device_unregister(&node->dev);
|
2005-05-08 20:28:53 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-12-12 08:00:56 +08:00
|
|
|
struct node *node_devices[MAX_NUMNODES];
|
2006-06-27 17:53:38 +08: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 17:53:41 +08:00
|
|
|
/*
|
|
|
|
* register cpu under node
|
|
|
|
*/
|
|
|
|
int register_cpu_under_node(unsigned int cpu, unsigned int nid)
|
|
|
|
{
|
2009-12-15 09:59:08 +08:00
|
|
|
int ret;
|
2011-12-22 06:29:42 +08:00
|
|
|
struct device *obj;
|
[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 17:53:41 +08:00
|
|
|
|
2009-12-15 09:59:06 +08:00
|
|
|
if (!node_online(nid))
|
|
|
|
return 0;
|
|
|
|
|
2011-12-22 06:29:42 +08:00
|
|
|
obj = get_cpu_device(cpu);
|
2009-12-15 09:59:06 +08:00
|
|
|
if (!obj)
|
|
|
|
return 0;
|
|
|
|
|
2012-12-12 08:00:56 +08:00
|
|
|
ret = sysfs_create_link(&node_devices[nid]->dev.kobj,
|
2009-12-15 09:59:06 +08:00
|
|
|
&obj->kobj,
|
|
|
|
kobject_name(&obj->kobj));
|
2009-12-15 09:59:08 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
return sysfs_create_link(&obj->kobj,
|
2012-12-12 08:00:56 +08:00
|
|
|
&node_devices[nid]->dev.kobj,
|
|
|
|
kobject_name(&node_devices[nid]->dev.kobj));
|
[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 17:53:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
|
|
|
|
{
|
2011-12-22 06:29:42 +08:00
|
|
|
struct device *obj;
|
2009-12-15 09:59:07 +08:00
|
|
|
|
|
|
|
if (!node_online(nid))
|
|
|
|
return 0;
|
|
|
|
|
2011-12-22 06:29:42 +08:00
|
|
|
obj = get_cpu_device(cpu);
|
2009-12-15 09:59:07 +08:00
|
|
|
if (!obj)
|
|
|
|
return 0;
|
|
|
|
|
2012-12-12 08:00:56 +08:00
|
|
|
sysfs_remove_link(&node_devices[nid]->dev.kobj,
|
2009-12-15 09:59:07 +08:00
|
|
|
kobject_name(&obj->kobj));
|
2009-12-15 09:59:08 +08:00
|
|
|
sysfs_remove_link(&obj->kobj,
|
2012-12-12 08:00:56 +08:00
|
|
|
kobject_name(&node_devices[nid]->dev.kobj));
|
2009-12-15 09:59:07 +08: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 17:53:41 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-01-07 06:39:14 +08:00
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
|
|
|
|
#define page_initialized(page) (page->lru.next)
|
|
|
|
|
|
|
|
static int get_nid_for_pfn(unsigned long pfn)
|
|
|
|
{
|
|
|
|
struct page *page;
|
|
|
|
|
|
|
|
if (!pfn_valid_within(pfn))
|
|
|
|
return -1;
|
|
|
|
page = pfn_to_page(pfn);
|
|
|
|
if (!page_initialized(page))
|
|
|
|
return -1;
|
|
|
|
return pfn_to_nid(pfn);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* register memory section under specified node if it spans that node */
|
|
|
|
int register_mem_sect_under_node(struct memory_block *mem_blk, int nid)
|
|
|
|
{
|
2009-12-15 09:59:05 +08:00
|
|
|
int ret;
|
2009-01-07 06:39:14 +08:00
|
|
|
unsigned long pfn, sect_start_pfn, sect_end_pfn;
|
|
|
|
|
|
|
|
if (!mem_blk)
|
|
|
|
return -EFAULT;
|
|
|
|
if (!node_online(nid))
|
|
|
|
return 0;
|
2011-01-21 00:44:29 +08:00
|
|
|
|
|
|
|
sect_start_pfn = section_nr_to_pfn(mem_blk->start_section_nr);
|
|
|
|
sect_end_pfn = section_nr_to_pfn(mem_blk->end_section_nr);
|
|
|
|
sect_end_pfn += PAGES_PER_SECTION - 1;
|
2009-01-07 06:39:14 +08:00
|
|
|
for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {
|
|
|
|
int page_nid;
|
|
|
|
|
|
|
|
page_nid = get_nid_for_pfn(pfn);
|
|
|
|
if (page_nid < 0)
|
|
|
|
continue;
|
|
|
|
if (page_nid != nid)
|
|
|
|
continue;
|
2012-12-12 08:00:56 +08:00
|
|
|
ret = sysfs_create_link_nowarn(&node_devices[nid]->dev.kobj,
|
2011-12-22 06:48:43 +08:00
|
|
|
&mem_blk->dev.kobj,
|
|
|
|
kobject_name(&mem_blk->dev.kobj));
|
2009-12-15 09:59:05 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
return sysfs_create_link_nowarn(&mem_blk->dev.kobj,
|
2012-12-12 08:00:56 +08:00
|
|
|
&node_devices[nid]->dev.kobj,
|
|
|
|
kobject_name(&node_devices[nid]->dev.kobj));
|
2009-01-07 06:39:14 +08:00
|
|
|
}
|
|
|
|
/* mem section does not span the specified node */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* unregister memory section under all nodes that it spans */
|
2011-01-21 00:44:29 +08:00
|
|
|
int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,
|
|
|
|
unsigned long phys_index)
|
2009-01-07 06:39:14 +08:00
|
|
|
{
|
2009-12-15 09:59:46 +08:00
|
|
|
NODEMASK_ALLOC(nodemask_t, unlinked_nodes, GFP_KERNEL);
|
2009-01-07 06:39:14 +08:00
|
|
|
unsigned long pfn, sect_start_pfn, sect_end_pfn;
|
|
|
|
|
2009-12-15 09:59:46 +08:00
|
|
|
if (!mem_blk) {
|
|
|
|
NODEMASK_FREE(unlinked_nodes);
|
2009-01-07 06:39:14 +08:00
|
|
|
return -EFAULT;
|
2009-12-15 09:59:46 +08:00
|
|
|
}
|
|
|
|
if (!unlinked_nodes)
|
|
|
|
return -ENOMEM;
|
|
|
|
nodes_clear(*unlinked_nodes);
|
2011-01-21 00:44:29 +08:00
|
|
|
|
|
|
|
sect_start_pfn = section_nr_to_pfn(phys_index);
|
2009-01-07 06:39:14 +08:00
|
|
|
sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1;
|
|
|
|
for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {
|
2009-03-11 03:55:45 +08:00
|
|
|
int nid;
|
2009-01-07 06:39:14 +08:00
|
|
|
|
|
|
|
nid = get_nid_for_pfn(pfn);
|
|
|
|
if (nid < 0)
|
|
|
|
continue;
|
|
|
|
if (!node_online(nid))
|
|
|
|
continue;
|
2009-12-15 09:59:46 +08:00
|
|
|
if (node_test_and_set(nid, *unlinked_nodes))
|
2009-01-07 06:39:14 +08:00
|
|
|
continue;
|
2012-12-12 08:00:56 +08:00
|
|
|
sysfs_remove_link(&node_devices[nid]->dev.kobj,
|
2011-12-22 06:48:43 +08:00
|
|
|
kobject_name(&mem_blk->dev.kobj));
|
|
|
|
sysfs_remove_link(&mem_blk->dev.kobj,
|
2012-12-12 08:00:56 +08:00
|
|
|
kobject_name(&node_devices[nid]->dev.kobj));
|
2009-01-07 06:39:14 +08:00
|
|
|
}
|
2009-12-15 09:59:46 +08:00
|
|
|
NODEMASK_FREE(unlinked_nodes);
|
2009-01-07 06:39:14 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int link_mem_sections(int nid)
|
|
|
|
{
|
|
|
|
unsigned long start_pfn = NODE_DATA(nid)->node_start_pfn;
|
|
|
|
unsigned long end_pfn = start_pfn + NODE_DATA(nid)->node_spanned_pages;
|
|
|
|
unsigned long pfn;
|
2010-09-30 03:00:56 +08:00
|
|
|
struct memory_block *mem_blk = NULL;
|
2009-01-07 06:39:14 +08:00
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) {
|
|
|
|
unsigned long section_nr = pfn_to_section_nr(pfn);
|
|
|
|
struct mem_section *mem_sect;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!present_section_nr(section_nr))
|
|
|
|
continue;
|
|
|
|
mem_sect = __nr_to_section(section_nr);
|
2012-01-31 05:57:12 +08:00
|
|
|
|
|
|
|
/* same memblock ? */
|
|
|
|
if (mem_blk)
|
|
|
|
if ((section_nr >= mem_blk->start_section_nr) &&
|
|
|
|
(section_nr <= mem_blk->end_section_nr))
|
|
|
|
continue;
|
|
|
|
|
2010-09-30 03:00:56 +08:00
|
|
|
mem_blk = find_memory_block_hinted(mem_sect, mem_blk);
|
2012-01-31 05:57:12 +08:00
|
|
|
|
2009-01-07 06:39:14 +08:00
|
|
|
ret = register_mem_sect_under_node(mem_blk, nid);
|
|
|
|
if (!err)
|
|
|
|
err = ret;
|
|
|
|
|
|
|
|
/* discard ref obtained in find_memory_block() */
|
|
|
|
}
|
2010-09-30 03:00:56 +08:00
|
|
|
|
|
|
|
if (mem_blk)
|
2011-12-22 06:48:43 +08:00
|
|
|
kobject_put(&mem_blk->dev.kobj);
|
2009-01-07 06:39:14 +08:00
|
|
|
return err;
|
|
|
|
}
|
2009-12-15 09:58:35 +08:00
|
|
|
|
2009-12-15 09:58:36 +08:00
|
|
|
#ifdef CONFIG_HUGETLBFS
|
2009-12-15 09:58:35 +08:00
|
|
|
/*
|
|
|
|
* Handle per node hstate attribute [un]registration on transistions
|
|
|
|
* to/from memoryless state.
|
|
|
|
*/
|
2009-12-15 09:58:36 +08:00
|
|
|
static void node_hugetlb_work(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct node *node = container_of(work, struct node, node_work);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We only get here when a node transitions to/from memoryless state.
|
|
|
|
* We can detect which transition occurred by examining whether the
|
|
|
|
* node has memory now. hugetlb_register_node() already check this
|
|
|
|
* so we try to register the attributes. If that fails, then the
|
|
|
|
* node has transitioned to memoryless, try to unregister the
|
|
|
|
* attributes.
|
|
|
|
*/
|
|
|
|
if (!hugetlb_register_node(node))
|
|
|
|
hugetlb_unregister_node(node);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void init_node_hugetlb_work(int nid)
|
|
|
|
{
|
2012-12-12 08:00:56 +08:00
|
|
|
INIT_WORK(&node_devices[nid]->node_work, node_hugetlb_work);
|
2009-12-15 09:58:36 +08:00
|
|
|
}
|
2009-12-15 09:58:35 +08:00
|
|
|
|
|
|
|
static int node_memory_callback(struct notifier_block *self,
|
|
|
|
unsigned long action, void *arg)
|
|
|
|
{
|
|
|
|
struct memory_notify *mnb = arg;
|
|
|
|
int nid = mnb->status_change_nid;
|
|
|
|
|
|
|
|
switch (action) {
|
2009-12-15 09:58:36 +08:00
|
|
|
case MEM_ONLINE:
|
|
|
|
case MEM_OFFLINE:
|
|
|
|
/*
|
|
|
|
* offload per node hstate [un]registration to a work thread
|
|
|
|
* when transitioning to/from memoryless state.
|
|
|
|
*/
|
2009-12-15 09:58:35 +08:00
|
|
|
if (nid != NUMA_NO_NODE)
|
2012-12-12 08:00:56 +08:00
|
|
|
schedule_work(&node_devices[nid]->node_work);
|
2009-12-15 09:58:35 +08:00
|
|
|
break;
|
2009-12-15 09:58:36 +08:00
|
|
|
|
2009-12-15 09:58:35 +08:00
|
|
|
case MEM_GOING_ONLINE:
|
|
|
|
case MEM_GOING_OFFLINE:
|
|
|
|
case MEM_CANCEL_ONLINE:
|
|
|
|
case MEM_CANCEL_OFFLINE:
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NOTIFY_OK;
|
|
|
|
}
|
2009-12-15 09:58:36 +08:00
|
|
|
#endif /* CONFIG_HUGETLBFS */
|
|
|
|
#else /* !CONFIG_MEMORY_HOTPLUG_SPARSE */
|
|
|
|
|
2009-01-07 06:39:14 +08:00
|
|
|
static int link_mem_sections(int nid) { return 0; }
|
2009-12-15 09:58:36 +08:00
|
|
|
#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
|
2009-12-15 09:58:35 +08:00
|
|
|
|
2009-12-15 09:58:36 +08:00
|
|
|
#if !defined(CONFIG_MEMORY_HOTPLUG_SPARSE) || \
|
|
|
|
!defined(CONFIG_HUGETLBFS)
|
2009-12-15 09:58:35 +08:00
|
|
|
static inline int node_memory_callback(struct notifier_block *self,
|
|
|
|
unsigned long action, void *arg)
|
|
|
|
{
|
|
|
|
return NOTIFY_OK;
|
|
|
|
}
|
2009-12-15 09:58:36 +08:00
|
|
|
|
|
|
|
static void init_node_hugetlb_work(int nid) { }
|
|
|
|
|
|
|
|
#endif
|
2009-01-07 06:39:14 +08:00
|
|
|
|
2006-06-27 17:53:38 +08: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 17:53:41 +08:00
|
|
|
int cpu;
|
2006-06-27 17:53:38 +08:00
|
|
|
|
|
|
|
if (node_online(nid)) {
|
|
|
|
int p_node = parent_node(nid);
|
|
|
|
struct node *parent = NULL;
|
|
|
|
|
|
|
|
if (p_node != nid)
|
2012-12-12 08:00:56 +08:00
|
|
|
parent = node_devices[p_node];
|
2006-06-27 17:53:38 +08:00
|
|
|
|
2012-12-12 08:00:56 +08:00
|
|
|
node_devices[nid] = kzalloc(sizeof(struct node), GFP_KERNEL);
|
|
|
|
if (!node_devices[nid])
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
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 17:53:41 +08:00
|
|
|
|
|
|
|
/* link cpu under this node */
|
|
|
|
for_each_present_cpu(cpu) {
|
|
|
|
if (cpu_to_node(cpu) == nid)
|
|
|
|
register_cpu_under_node(cpu, nid);
|
|
|
|
}
|
2009-01-07 06:39:14 +08:00
|
|
|
|
|
|
|
/* link memory sections under this node */
|
|
|
|
error = link_mem_sections(nid);
|
2009-12-15 09:58:36 +08:00
|
|
|
|
|
|
|
/* initialize work queue for memory hot plug */
|
|
|
|
init_node_hugetlb_work(nid);
|
2006-06-27 17:53:38 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void unregister_one_node(int nid)
|
|
|
|
{
|
2014-03-06 17:18:21 +08:00
|
|
|
if (!node_devices[nid])
|
|
|
|
return;
|
|
|
|
|
2012-12-12 08:00:56 +08:00
|
|
|
unregister_node(node_devices[nid]);
|
|
|
|
node_devices[nid] = NULL;
|
2006-06-27 17:53:38 +08:00
|
|
|
}
|
|
|
|
|
2007-10-16 16:26:27 +08:00
|
|
|
/*
|
|
|
|
* node states attributes
|
|
|
|
*/
|
|
|
|
|
|
|
|
static ssize_t print_nodes_state(enum node_states state, char *buf)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
2012-05-30 06:06:20 +08:00
|
|
|
n = nodelist_scnprintf(buf, PAGE_SIZE-2, node_states[state]);
|
|
|
|
buf[n++] = '\n';
|
|
|
|
buf[n] = '\0';
|
2007-10-16 16:26:27 +08:00
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2010-01-05 19:47:59 +08:00
|
|
|
struct node_attr {
|
2011-12-22 06:48:43 +08:00
|
|
|
struct device_attribute attr;
|
2010-01-05 19:47:59 +08:00
|
|
|
enum node_states state;
|
|
|
|
};
|
2007-10-16 16:26:27 +08:00
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
static ssize_t show_node_state(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2007-10-16 16:26:27 +08:00
|
|
|
{
|
2010-01-05 19:47:59 +08:00
|
|
|
struct node_attr *na = container_of(attr, struct node_attr, attr);
|
|
|
|
return print_nodes_state(na->state, buf);
|
2007-10-16 16:26:27 +08:00
|
|
|
}
|
|
|
|
|
2010-01-05 19:47:59 +08:00
|
|
|
#define _NODE_ATTR(name, state) \
|
2011-12-22 06:48:43 +08:00
|
|
|
{ __ATTR(name, 0444, show_node_state, NULL), state }
|
2007-10-16 16:26:27 +08:00
|
|
|
|
2010-01-05 19:47:59 +08:00
|
|
|
static struct node_attr node_state_attr[] = {
|
2012-12-12 08:03:13 +08:00
|
|
|
[N_POSSIBLE] = _NODE_ATTR(possible, N_POSSIBLE),
|
|
|
|
[N_ONLINE] = _NODE_ATTR(online, N_ONLINE),
|
|
|
|
[N_NORMAL_MEMORY] = _NODE_ATTR(has_normal_memory, N_NORMAL_MEMORY),
|
2007-10-16 16:26:27 +08:00
|
|
|
#ifdef CONFIG_HIGHMEM
|
2012-12-12 08:03:13 +08:00
|
|
|
[N_HIGH_MEMORY] = _NODE_ATTR(has_high_memory, N_HIGH_MEMORY),
|
2012-12-13 05:52:00 +08:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_MOVABLE_NODE
|
|
|
|
[N_MEMORY] = _NODE_ATTR(has_memory, N_MEMORY),
|
2007-10-16 16:26:27 +08:00
|
|
|
#endif
|
2012-12-12 08:03:13 +08:00
|
|
|
[N_CPU] = _NODE_ATTR(has_cpu, N_CPU),
|
2007-10-16 16:26:27 +08:00
|
|
|
};
|
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
static struct attribute *node_state_attrs[] = {
|
2012-12-12 08:03:13 +08:00
|
|
|
&node_state_attr[N_POSSIBLE].attr.attr,
|
|
|
|
&node_state_attr[N_ONLINE].attr.attr,
|
|
|
|
&node_state_attr[N_NORMAL_MEMORY].attr.attr,
|
2010-01-05 19:48:04 +08:00
|
|
|
#ifdef CONFIG_HIGHMEM
|
2012-12-12 08:03:13 +08:00
|
|
|
&node_state_attr[N_HIGH_MEMORY].attr.attr,
|
2012-12-13 05:52:00 +08:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_MOVABLE_NODE
|
|
|
|
&node_state_attr[N_MEMORY].attr.attr,
|
2010-01-05 19:48:04 +08:00
|
|
|
#endif
|
2012-12-12 08:03:13 +08:00
|
|
|
&node_state_attr[N_CPU].attr.attr,
|
2010-01-05 19:48:04 +08:00
|
|
|
NULL
|
|
|
|
};
|
2007-10-16 16:26:27 +08:00
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
static struct attribute_group memory_root_attr_group = {
|
|
|
|
.attrs = node_state_attrs,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct attribute_group *cpu_root_attr_groups[] = {
|
|
|
|
&memory_root_attr_group,
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
|
2009-12-15 09:58:35 +08:00
|
|
|
#define NODE_CALLBACK_PRI 2 /* lower than SLAB */
|
2005-05-08 20:28:53 +08:00
|
|
|
static int __init register_node_type(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-10-16 16:26:27 +08:00
|
|
|
int ret;
|
|
|
|
|
2010-01-05 19:48:04 +08:00
|
|
|
BUILD_BUG_ON(ARRAY_SIZE(node_state_attr) != NR_NODE_STATES);
|
|
|
|
BUILD_BUG_ON(ARRAY_SIZE(node_state_attrs)-1 != NR_NODE_STATES);
|
|
|
|
|
2011-12-22 06:48:43 +08:00
|
|
|
ret = subsys_system_register(&node_subsys, cpu_root_attr_groups);
|
2009-12-15 09:58:35 +08:00
|
|
|
if (!ret) {
|
2013-04-30 06:08:07 +08:00
|
|
|
static struct notifier_block node_memory_callback_nb = {
|
|
|
|
.notifier_call = node_memory_callback,
|
|
|
|
.priority = NODE_CALLBACK_PRI,
|
|
|
|
};
|
|
|
|
register_hotmemory_notifier(&node_memory_callback_nb);
|
2009-12-15 09:58:35 +08:00
|
|
|
}
|
2007-10-16 16:26:27 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Note: we're not going to unregister the node class if we fail
|
|
|
|
* to register the node state class attribute files.
|
|
|
|
*/
|
|
|
|
return ret;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
postcore_initcall(register_node_type);
|