Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d544abd5 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

lib/radix-tree: Convert to hotplug state machine 



Install the callbacks via the state machine.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 5588f5af

include/linux/cpuhotplug.h

+1 −0
Original line number Diff line number Diff line
@@ -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,

lib/radix-tree.c

+12 −13
Original line number Diff line number Diff line
@@ -1642,15 +1642,12 @@ 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;
@@ -1658,16 +1655,18 @@ static int radix_tree_callback(struct notifier_block *nfb, 
		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);

}