mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-12 05:24:12 +08:00
ca889e6c45
The numa statistics are really event counters. But they are per node and so we have had special treatment for these counters through additional fields on the pcp structure. We can now use the per zone nature of the zoned VM counters to realize these. This will shrink the size of the pcp structure on NUMA systems. We will have some room to add additional per zone counters that will all still fit in the same cacheline. Bits Prior pcp size Size after patch We can add ------------------------------------------------------------------ 64 128 bytes (16 words) 80 bytes (10 words) 48 32 76 bytes (19 words) 56 bytes (14 words) 8 (64 byte cacheline) 72 (128 byte) Remove the special statistics for numa and replace them with zoned vm counters. This has the side effect that global sums of these events now show up in /proc/vmstat. Also take the opportunity to move the zone_statistics() function from page_alloc.c into vmstat.c. Discussions: V2 http://marc.theaimsgroup.com/?t=115048227000002&r=1&w=2 Signed-off-by: Christoph Lameter <clameter@sgi.com> Acked-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
236 lines
6.1 KiB
C
236 lines
6.1 KiB
C
/*
|
|
* 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>
|
|
#include <linux/cpu.h>
|
|
|
|
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;
|
|
unsigned long inactive;
|
|
unsigned long active;
|
|
unsigned long free;
|
|
|
|
si_meminfo_node(&i, nid);
|
|
__get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
|
|
|
|
|
|
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"
|
|
"Node %d LowFree: %8lu kB\n"
|
|
"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"
|
|
"Node %d PageTables: %8lu kB\n"
|
|
"Node %d NFS Unstable: %8lu kB\n"
|
|
"Node %d Bounce: %8lu kB\n"
|
|
"Node %d Slab: %8lu kB\n",
|
|
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),
|
|
nid, K(i.freeram - i.freehigh),
|
|
nid, K(node_page_state(nid, NR_FILE_DIRTY)),
|
|
nid, K(node_page_state(nid, NR_WRITEBACK)),
|
|
nid, K(node_page_state(nid, NR_FILE_PAGES)),
|
|
nid, K(node_page_state(nid, NR_FILE_MAPPED)),
|
|
nid, K(node_page_state(nid, NR_ANON_PAGES)),
|
|
nid, K(node_page_state(nid, NR_PAGETABLE)),
|
|
nid, K(node_page_state(nid, NR_UNSTABLE_NFS)),
|
|
nid, K(node_page_state(nid, NR_BOUNCE)),
|
|
nid, K(node_page_state(nid, NR_SLAB)));
|
|
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)
|
|
{
|
|
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",
|
|
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));
|
|
}
|
|
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.
|
|
*/
|
|
int register_node(struct node *node, int num, struct node *parent)
|
|
{
|
|
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;
|
|
}
|
|
|
|
/**
|
|
* 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);
|
|
}
|
|
|
|
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);
|
|
struct node *parent = NULL;
|
|
|
|
if (p_node != 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;
|
|
|
|
}
|
|
|
|
void unregister_one_node(int nid)
|
|
{
|
|
unregister_node(&node_devices[nid]);
|
|
}
|
|
|
|
static int __init register_node_type(void)
|
|
{
|
|
return sysdev_class_register(&node_class);
|
|
}
|
|
postcore_initcall(register_node_type);
|