android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: maple_tree: introduce mas_put_in_tree()

Browse Source 
mas_replace() has a single user that takes a flag which is now always
true.  Replace this function with mas_put_in_tree() to better align with
mas_replace_node().  Inline the remaining logic into the only caller;
mas_wmb_replace().

Link: https://lkml.kernel.org/r/20230804165951.2661157-4-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Paul E. McKenney <paulmck@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

(cherry picked from commit 1238f6a226dc27ec34d229b71b02f0d6c46bbf11)
Bug: 305159730
Signed-off-by: Hyesoo Yu <hyesoo.yu@samsung.com>
Change-Id: I180c94f3b57320787c5e2da55566a05193ead6b5
This commit is contained in:
Liam R. Howlett 2023-08-04 12:59:48 -04:00 committed by Suren Baghdasaryan
parent d2e45cee2d
commit e69d6570ed
1 changed files with 27 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
lib/maple_tree.c
View File

@ -1745,45 +1745,32 @@ static inline void mas_adopt_children(struct ma_state *mas,
} }
/* /*
* mas_replace() - Replace a maple node in the tree with mas->node. Uses the * mas_put_in_tree() - Put a new node in the tree, smp_wmb(), and mark the old
* parent encoding to locate the maple node in the tree. * node as dead.
* @mas - the ma_state to use for operations. * @mas - the maple state with the new node
* @advanced - boolean to adopt the child nodes and free the old node (false) or * @old_enode - The old maple encoded node to replace.
* leave the node (true) and handle the adoption and free elsewhere.
*/ */
static inline void mas_replace(struct ma_state *mas, bool advanced) static inline void mas_put_in_tree(struct ma_state *mas,
struct maple_enode *old_enode)
__must_hold(mas->tree->lock) __must_hold(mas->tree->lock)
{ {
struct maple_node *mn = mas_mn(mas); unsigned char offset;
struct maple_enode *old_enode; void __rcu **slots;
unsigned char offset = 0;
void __rcu **slots = NULL;
if (ma_is_root(mn)) {
old_enode = mas_root_locked(mas);
} else {
offset = mte_parent_slot(mas->node);
slots = ma_slots(mte_parent(mas->node),
mas_parent_enum(mas, mas->node));
old_enode = mas_slot_locked(mas, slots, offset);
}
if (!advanced && !mte_is_leaf(mas->node))
mas_adopt_children(mas, mas->node);
if (mte_is_root(mas->node)) { if (mte_is_root(mas->node)) {
mn->parent = ma_parent_ptr( mas_mn(mas)->parent = ma_parent_ptr(
((unsigned long)mas->tree | MA_ROOT_PARENT)); ((unsigned long)mas->tree | MA_ROOT_PARENT));
rcu_assign_pointer(mas->tree->ma_root, mte_mk_root(mas->node)); rcu_assign_pointer(mas->tree->ma_root, mte_mk_root(mas->node));
mas_set_height(mas); mas_set_height(mas);
} else { } else {
offset = mte_parent_slot(mas->node);
slots = ma_slots(mte_parent(mas->node),
mas_parent_enum(mas, mas->node));
rcu_assign_pointer(slots[offset], mas->node); rcu_assign_pointer(slots[offset], mas->node);
} }
if (!advanced) { mte_set_node_dead(old_enode);
mte_set_node_dead(old_enode);
mas_free(mas, old_enode);
}
} }
/* /*
@ -1797,22 +1784,7 @@ static inline void mas_replace_node(struct ma_state *mas,
struct maple_enode *old_enode) struct maple_enode *old_enode)
__must_hold(mas->tree->ma_lock) __must_hold(mas->tree->ma_lock)
{ {
if (mte_is_root(mas->node)) { mas_put_in_tree(mas, old_enode);
mas_mn(mas)->parent = ma_parent_ptr(
((unsigned long)mas->tree | MA_ROOT_PARENT));
rcu_assign_pointer(mas->tree->ma_root, mte_mk_root(mas->node));
mas_set_height(mas);
} else {
unsigned char offset = 0;
void __rcu **slots = NULL;
offset = mte_parent_slot(mas->node);
slots = ma_slots(mte_parent(mas->node),
mas_parent_enum(mas, mas->node));
rcu_assign_pointer(slots[offset], mas->node);
}
mte_set_node_dead(old_enode);
mas_free(mas, old_enode); mas_free(mas, old_enode);
} }
@ -2842,11 +2814,20 @@ static inline void mas_wmb_replace(struct ma_state *mas,
struct ma_topiary *free, struct ma_topiary *free,
struct ma_topiary *destroy) struct ma_topiary *destroy)
{ {
/* All nodes must see old data as dead prior to replacing that data */ struct maple_enode *old_enode;
smp_wmb(); /* Needed for RCU */
if (mte_is_root(mas->node)) {
old_enode = mas_root_locked(mas);
} else {
unsigned char offset = mte_parent_slot(mas->node);
void __rcu **slots = ma_slots(mte_parent(mas->node),
mas_parent_enum(mas, mas->node));
old_enode = mas_slot_locked(mas, slots, offset);
}
/* Insert the new data in the tree */ /* Insert the new data in the tree */
mas_replace(mas, true); mas_put_in_tree(mas, old_enode);
if (!mte_is_leaf(mas->node)) if (!mte_is_leaf(mas->node))
mas_descend_adopt(mas); mas_descend_adopt(mas);