mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 12:21:22 -05:00
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
6c6c47b063 ("mm, slab: call kvfree_rcu_barrier() from kmem_cache_destroy()").
Thus, replace call_rcu + mt_free_rcu with kfree_rcu.
Signed-off-by: Pedro Falcato <pfalcato@suse.de>
Reviewed-by: Harry Yoo <harry.yoo@oracle.com>
Reviewed-by: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
This commit is contained in:
committed by
Vlastimil Babka
parent
551a6e757a
commit
9b60811cb3
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user