diff options
author | Lee Schermerhorn <Lee.Schermerhorn@hp.com> | 2007-10-16 04:26:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:03 -0400 |
commit | bde631a51876f23e9bbdce43f02b7232502c151e (patch) | |
tree | a2485a05c83b6ad9dfa45fe6194100d7337d5b26 /drivers/base/node.c | |
parent | e2fc88d0643ca68f2011e6db4aa31e22bd94210c (diff) |
mm: add node states sysfs class attributeS
Add a per node state sysfs class attribute file to /sys/devices/system/node
to display node state masks.
E.g., on a 4-cell HP ia64 NUMA platform, we have 5 nodes: 4 representing
the actual hardware cells and one memory-only pseudo-node representing a
small amount [512MB] of "hardware interleaved" memory. With this patch, in
/sys/devices/system/node we see:
#ls -1F /sys/devices/system/node
has_cpu
has_normal_memory
node0/
node1/
node2/
node3/
node4/
online
possible
#cat /sys/devices/system/node/possible
0-255
#cat /sys/devices/system/node/online
0-4
#cat /sys/devices/system/node/has_normal_memory
0-4
#cat /sys/devices/system/node/has_cpu
0-3
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/base/node.c')
-rw-r--r-- | drivers/base/node.c | 91 |
1 files changed, 90 insertions, 1 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index cae346ef1b20..88eeed72b5d6 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/topology.h> | 12 | #include <linux/topology.h> |
13 | #include <linux/nodemask.h> | 13 | #include <linux/nodemask.h> |
14 | #include <linux/cpu.h> | 14 | #include <linux/cpu.h> |
15 | #include <linux/device.h> | ||
15 | 16 | ||
16 | static struct sysdev_class node_class = { | 17 | static struct sysdev_class node_class = { |
17 | set_kset_name("node"), | 18 | set_kset_name("node"), |
@@ -232,8 +233,96 @@ void unregister_one_node(int nid) | |||
232 | unregister_node(&node_devices[nid]); | 233 | unregister_node(&node_devices[nid]); |
233 | } | 234 | } |
234 | 235 | ||
236 | /* | ||
237 | * node states attributes | ||
238 | */ | ||
239 | |||
240 | static ssize_t print_nodes_state(enum node_states state, char *buf) | ||
241 | { | ||
242 | int n; | ||
243 | |||
244 | n = nodelist_scnprintf(buf, PAGE_SIZE, node_states[state]); | ||
245 | if (n > 0 && PAGE_SIZE > n + 1) { | ||
246 | *(buf + n++) = '\n'; | ||
247 | *(buf + n++) = '\0'; | ||
248 | } | ||
249 | return n; | ||
250 | } | ||
251 | |||
252 | static ssize_t print_nodes_possible(struct sysdev_class *class, char *buf) | ||
253 | { | ||
254 | return print_nodes_state(N_POSSIBLE, buf); | ||
255 | } | ||
256 | |||
257 | static ssize_t print_nodes_online(struct sysdev_class *class, char *buf) | ||
258 | { | ||
259 | return print_nodes_state(N_ONLINE, buf); | ||
260 | } | ||
261 | |||
262 | static ssize_t print_nodes_has_normal_memory(struct sysdev_class *class, | ||
263 | char *buf) | ||
264 | { | ||
265 | return print_nodes_state(N_NORMAL_MEMORY, buf); | ||
266 | } | ||
267 | |||
268 | static ssize_t print_nodes_has_cpu(struct sysdev_class *class, char *buf) | ||
269 | { | ||
270 | return print_nodes_state(N_CPU, buf); | ||
271 | } | ||
272 | |||
273 | static SYSDEV_CLASS_ATTR(possible, 0444, print_nodes_possible, NULL); | ||
274 | static SYSDEV_CLASS_ATTR(online, 0444, print_nodes_online, NULL); | ||
275 | static SYSDEV_CLASS_ATTR(has_normal_memory, 0444, print_nodes_has_normal_memory, | ||
276 | NULL); | ||
277 | static SYSDEV_CLASS_ATTR(has_cpu, 0444, print_nodes_has_cpu, NULL); | ||
278 | |||
279 | #ifdef CONFIG_HIGHMEM | ||
280 | static ssize_t print_nodes_has_high_memory(struct sysdev_class *class, | ||
281 | char *buf) | ||
282 | { | ||
283 | return print_nodes_state(N_HIGH_MEMORY, buf); | ||
284 | } | ||
285 | |||
286 | static SYSDEV_CLASS_ATTR(has_high_memory, 0444, print_nodes_has_high_memory, | ||
287 | NULL); | ||
288 | #endif | ||
289 | |||
290 | struct sysdev_class_attribute *node_state_attr[] = { | ||
291 | &attr_possible, | ||
292 | &attr_online, | ||
293 | &attr_has_normal_memory, | ||
294 | #ifdef CONFIG_HIGHMEM | ||
295 | &attr_has_high_memory, | ||
296 | #endif | ||
297 | &attr_has_cpu, | ||
298 | }; | ||
299 | |||
300 | static int node_states_init(void) | ||
301 | { | ||
302 | int i; | ||
303 | int err = 0; | ||
304 | |||
305 | for (i = 0; i < NR_NODE_STATES; i++) { | ||
306 | int ret; | ||
307 | ret = sysdev_class_create_file(&node_class, node_state_attr[i]); | ||
308 | if (!err) | ||
309 | err = ret; | ||
310 | } | ||
311 | return err; | ||
312 | } | ||
313 | |||
235 | static int __init register_node_type(void) | 314 | static int __init register_node_type(void) |
236 | { | 315 | { |
237 | return sysdev_class_register(&node_class); | 316 | int ret; |
317 | |||
318 | ret = sysdev_class_register(&node_class); | ||
319 | if (!ret) | ||
320 | ret = node_states_init(); | ||
321 | |||
322 | /* | ||
323 | * Note: we're not going to unregister the node class if we fail | ||
324 | * to register the node state class attribute files. | ||
325 | */ | ||
326 | return ret; | ||
238 | } | 327 | } |
239 | postcore_initcall(register_node_type); | 328 | postcore_initcall(register_node_type); |