lib/radix-tree: Convert to hotplug state machine

Install the callbacks via the state machine.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20161103145021.28528-6-bigeasy@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index 04e5f99ffc7084c4155727c66ebf849a410e4074..89310fb1031df07429ab64fd2d3c09844e47d825 100644 (file)
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -34,6 +34,7 @@ enum cpuhp_state {
        CPUHP_PRINTK_DEAD,
        CPUHP_MM_MEMCQ_DEAD,
        CPUHP_PERCPU_CNT_DEAD,
+       CPUHP_RADIX_DEAD,
        CPUHP_WORKQUEUE_PREP,
        CPUHP_POWER_NUMA_PREPARE,
        CPUHP_HRTIMERS_PREPARE,

diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 8e6d552c40ddfc7fa745a8a8acf34ee17f02bc3d..4b8bb3618b8317651fa8888b37d317afd96e3447 100644 (file)
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -1642,32 +1642,31 @@ static __init void radix_tree_init_maxnodes(void)
        }
 }
 
-static int radix_tree_callback(struct notifier_block *nfb,
-                               unsigned long action, void *hcpu)
+static int radix_tree_cpu_dead(unsigned int cpu)
 {
-       int cpu = (long)hcpu;
        struct radix_tree_preload *rtp;
        struct radix_tree_node *node;
 
        /* Free per-cpu pool of preloaded nodes */
-       if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {
-               rtp = &per_cpu(radix_tree_preloads, cpu);
-               while (rtp->nr) {
-                       node = rtp->nodes;
-                       rtp->nodes = node->private_data;
-                       kmem_cache_free(radix_tree_node_cachep, node);
-                       rtp->nr--;
-               }
+       rtp = &per_cpu(radix_tree_preloads, cpu);
+       while (rtp->nr) {
+               node = rtp->nodes;
+               rtp->nodes = node->private_data;
+               kmem_cache_free(radix_tree_node_cachep, node);
+               rtp->nr--;
        }
-       return NOTIFY_OK;
+       return 0;
 }
 
 void __init radix_tree_init(void)
 {
+       int ret;
        radix_tree_node_cachep = kmem_cache_create("radix_tree_node",
                        sizeof(struct radix_tree_node), 0,
                        SLAB_PANIC | SLAB_RECLAIM_ACCOUNT,
                        radix_tree_node_ctor);
        radix_tree_init_maxnodes();
-       hotcpu_notifier(radix_tree_callback, 0);
+       ret = cpuhp_setup_state_nocalls(CPUHP_RADIX_DEAD, "lib/radix:dead",
+                                       NULL, radix_tree_cpu_dead);
+       WARN_ON(ret < 0);
 }