Skip to contentSkip to conversation

maple_tree-fix-depth-tracking-in-maple_state.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Nov 8, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: maple_tree: fix depth tracking in maple_state
has been removed from the -mm tree. Its filename was
maple_tree-fix-depth-tracking-in-maple_state.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Liam Howlett <[email protected]>
Subject: maple_tree: fix depth tracking in maple_state
Date: Mon, 7 Nov 2022 16:38:35 +0000

It is possible to confuse the depth tracking in the maple state by searching the same node for values. Fix the depth tracking by moving where the depth is incremented closer to where the node changes level. Also change the initial depth setting when using the root node.

---

 lib/maple_tree.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-fix-depth-tracking-in-maple_state +2 -1
@@ -1351,6 +1351,7 @@ static inline struct maple_enode *mas_st
 		root = mas_root(mas);
 		/* Tree with nodes */
 		if (likely(xa_is_node(root))) {
+			mas->depth = 1;
 			mas->node = mte_safe_root(root);
 			return NULL;
 		}
@@ -3727,7 +3728,6 @@ static bool mas_is_span_wr(struct ma_wr_
 
 static inline void mas_wr_walk_descend(struct ma_wr_state *wr_mas)
 {
-	wr_mas->mas->depth++;
 	wr_mas->type = mte_node_type(wr_mas->mas->node);
 	mas_wr_node_walk(wr_mas);
 	wr_mas->slots = ma_slots(wr_mas->node, wr_mas->type);
@@ -3739,6 +3739,7 @@ static inline void mas_wr_walk_traverse(
 	wr_mas->mas->min = wr_mas->r_min;
 	wr_mas->mas->node = wr_mas->content;
 	wr_mas->mas->offset = 0;
+	wr_mas->mas->depth++;
 }
 /*
  * mas_wr_walk() - Walk the tree for a write.

_

Patches currently in -mm which might be from [email protected] are

maple_tree-fix-mas_find_rev-comment.patch maple_tree-update-copyright-dates-for-test-code.patch maple_tree-mte_set_full-and-mte_clear_full-clang-analyzer-clean-up.patch