Commit 9b60811c authored by Pedro Falcato's avatar Pedro Falcato Committed by Vlastimil Babka
Browse files

maple_tree: Use kfree_rcu in ma_free_rcu 



kfree_rcu is an optimized version of call_rcu + kfree. It used to not be
possible to call it on non-kmalloc objects, but this restriction was
lifted ever since SLOB was dropped from the kernel, and since commit
6c6c47b0 ("mm, slab: call kvfree_rcu_barrier() from kmem_cache_destroy()").

Thus, replace call_rcu + mt_free_rcu with kfree_rcu.

Signed-off-by: default avatarPedro Falcato <pfalcato@suse.de>
Reviewed-by: default avatarHarry Yoo <harry.yoo@oracle.com>
Reviewed-by: default avatarSuren Baghdasaryan <surenb@google.com>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent 551a6e75

lib/maple_tree.c

+3 −10
Original line number Diff line number Diff line
@@ -187,13 +187,6 @@ static inline void mt_free_bulk(size_t size, void __rcu **nodes) 
	kmem_cache_free_bulk(maple_node_cache, size, (void **)nodes);

}



static void mt_free_rcu(struct rcu_head *head)

{

	struct maple_node *node = container_of(head, struct maple_node, rcu);



	kmem_cache_free(maple_node_cache, node);

}



/*

 * ma_free_rcu() - Use rcu callback to free a maple node

 * @node: The node to free
@@ -204,7 +197,7 @@ static void mt_free_rcu(struct rcu_head *head) 
static void ma_free_rcu(struct maple_node *node)

{

	WARN_ON(node->parent != ma_parent_ptr(node));

	call_rcu(&node->rcu, mt_free_rcu);

	kfree_rcu(node, rcu);

}



static void mt_set_height(struct maple_tree *mt, unsigned char height)
@@ -5099,7 +5092,7 @@ static void mt_free_walk(struct rcu_head *head) 
	mt_free_bulk(node->slot_len, slots);



free_leaf:

	mt_free_rcu(&node->rcu);

	mt_free_one(node);

}



static inline void __rcu **mte_destroy_descend(struct maple_enode **enode,
@@ -5183,7 +5176,7 @@ static void mt_destroy_walk(struct maple_enode *enode, struct maple_tree *mt, 


free_leaf:

	if (free)

		mt_free_rcu(&node->rcu);

		mt_free_one(node);

	else

		mt_clear_meta(mt, node, node->type);

}