diff options
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/node.c | 53 |
1 files changed, 48 insertions, 5 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index f502711d28db..9e218a6d4a5b 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
@@ -177,8 +177,8 @@ static SYSDEV_ATTR(distance, S_IRUGO, node_read_distance, NULL); | |||
177 | /* | 177 | /* |
178 | * hugetlbfs per node attributes registration interface: | 178 | * hugetlbfs per node attributes registration interface: |
179 | * When/if hugetlb[fs] subsystem initializes [sometime after this module], | 179 | * When/if hugetlb[fs] subsystem initializes [sometime after this module], |
180 | * it will register its per node attributes for all nodes online at that | 180 | * it will register its per node attributes for all online nodes with |
181 | * time. It will also call register_hugetlbfs_with_node(), below, to | 181 | * memory. It will also call register_hugetlbfs_with_node(), below, to |
182 | * register its attribute registration functions with this node driver. | 182 | * register its attribute registration functions with this node driver. |
183 | * Once these hooks have been initialized, the node driver will call into | 183 | * Once these hooks have been initialized, the node driver will call into |
184 | * the hugetlb module to [un]register attributes for hot-plugged nodes. | 184 | * the hugetlb module to [un]register attributes for hot-plugged nodes. |
@@ -188,7 +188,8 @@ static node_registration_func_t __hugetlb_unregister_node; | |||
188 | 188 | ||
189 | static inline void hugetlb_register_node(struct node *node) | 189 | static inline void hugetlb_register_node(struct node *node) |
190 | { | 190 | { |
191 | if (__hugetlb_register_node) | 191 | if (__hugetlb_register_node && |
192 | node_state(node->sysdev.id, N_HIGH_MEMORY)) | ||
192 | __hugetlb_register_node(node); | 193 | __hugetlb_register_node(node); |
193 | } | 194 | } |
194 | 195 | ||
@@ -233,6 +234,7 @@ int register_node(struct node *node, int num, struct node *parent) | |||
233 | sysdev_create_file(&node->sysdev, &attr_distance); | 234 | sysdev_create_file(&node->sysdev, &attr_distance); |
234 | 235 | ||
235 | scan_unevictable_register_node(node); | 236 | scan_unevictable_register_node(node); |
237 | |||
236 | hugetlb_register_node(node); | 238 | hugetlb_register_node(node); |
237 | } | 239 | } |
238 | return error; | 240 | return error; |
@@ -254,7 +256,7 @@ void unregister_node(struct node *node) | |||
254 | sysdev_remove_file(&node->sysdev, &attr_distance); | 256 | sysdev_remove_file(&node->sysdev, &attr_distance); |
255 | 257 | ||
256 | scan_unevictable_unregister_node(node); | 258 | scan_unevictable_unregister_node(node); |
257 | hugetlb_unregister_node(node); | 259 | hugetlb_unregister_node(node); /* no-op, if memoryless node */ |
258 | 260 | ||
259 | sysdev_unregister(&node->sysdev); | 261 | sysdev_unregister(&node->sysdev); |
260 | } | 262 | } |
@@ -384,8 +386,45 @@ static int link_mem_sections(int nid) | |||
384 | } | 386 | } |
385 | return err; | 387 | return err; |
386 | } | 388 | } |
389 | |||
390 | /* | ||
391 | * Handle per node hstate attribute [un]registration on transistions | ||
392 | * to/from memoryless state. | ||
393 | */ | ||
394 | |||
395 | static int node_memory_callback(struct notifier_block *self, | ||
396 | unsigned long action, void *arg) | ||
397 | { | ||
398 | struct memory_notify *mnb = arg; | ||
399 | int nid = mnb->status_change_nid; | ||
400 | |||
401 | switch (action) { | ||
402 | case MEM_ONLINE: /* memory successfully brought online */ | ||
403 | if (nid != NUMA_NO_NODE) | ||
404 | hugetlb_register_node(&node_devices[nid]); | ||
405 | break; | ||
406 | case MEM_OFFLINE: /* or offline */ | ||
407 | if (nid != NUMA_NO_NODE) | ||
408 | hugetlb_unregister_node(&node_devices[nid]); | ||
409 | break; | ||
410 | case MEM_GOING_ONLINE: | ||
411 | case MEM_GOING_OFFLINE: | ||
412 | case MEM_CANCEL_ONLINE: | ||
413 | case MEM_CANCEL_OFFLINE: | ||
414 | default: | ||
415 | break; | ||
416 | } | ||
417 | |||
418 | return NOTIFY_OK; | ||
419 | } | ||
387 | #else | 420 | #else |
388 | static int link_mem_sections(int nid) { return 0; } | 421 | static int link_mem_sections(int nid) { return 0; } |
422 | |||
423 | static inline int node_memory_callback(struct notifier_block *self, | ||
424 | unsigned long action, void *arg) | ||
425 | { | ||
426 | return NOTIFY_OK; | ||
427 | } | ||
389 | #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ | 428 | #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ |
390 | 429 | ||
391 | int register_one_node(int nid) | 430 | int register_one_node(int nid) |
@@ -499,13 +538,17 @@ static int node_states_init(void) | |||
499 | return err; | 538 | return err; |
500 | } | 539 | } |
501 | 540 | ||
541 | #define NODE_CALLBACK_PRI 2 /* lower than SLAB */ | ||
502 | static int __init register_node_type(void) | 542 | static int __init register_node_type(void) |
503 | { | 543 | { |
504 | int ret; | 544 | int ret; |
505 | 545 | ||
506 | ret = sysdev_class_register(&node_class); | 546 | ret = sysdev_class_register(&node_class); |
507 | if (!ret) | 547 | if (!ret) { |
508 | ret = node_states_init(); | 548 | ret = node_states_init(); |
549 | hotplug_memory_notifier(node_memory_callback, | ||
550 | NODE_CALLBACK_PRI); | ||
551 | } | ||
509 | 552 | ||
510 | /* | 553 | /* |
511 | * Note: we're not going to unregister the node class if we fail | 554 | * Note: we're not going to unregister the node class if we fail |