maple_tree-reduce-resets-during-store-setup.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: reduce resets during store setup
has been removed from the -mm tree. Its filename was
maple_tree-reduce-resets-during-store-setup.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Liam R. Howlett" <[email protected]>
Subject: maple_tree: reduce resets during store setup
Date: Mon, 24 Jul 2023 14:31:56 -0400
mas_prealloc() may walk partially down the tree before finding that a split or spanning store is needed. When the write occurs, relax the logic on resetting the walk so that partial walks will not restart, but walks that have gone too far (a store that affects beyond the current node) should be restarted.
---
lib/maple_tree.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-reduce-resets-during-store-setup +26 -11
@@ -5424,19 +5424,34 @@ static inline void mte_destroy_walk(strustatic void mas_wr_store_setup (struct ma_wr_state *wr_mas) { +if (mas_is_start (wr_mas->mas)) +return ; +if (unlikely (mas_is_paused (wr_mas->mas))) -mas_reset (wr_mas->mas); + goto reset; + +if (unlikely (mas_is_none (wr_mas->mas))) + goto reset; + +/* +* A less strict version of mas_is_span_wr() where we allow spanning +* writes within this node. This is to stop partial walks in +* mas_prealloc() from being reset. +*/ +if (wr_mas->mas->last > wr_mas->mas->max) + goto reset; + +if (wr_mas->entry) +return ; + +if (mte_is_leaf (wr_mas->mas->node) && + wr_mas->mas->last == wr_mas->mas->max) + goto reset; + +return ; -if (!mas_is_start (wr_mas->mas)) { -if (mas_is_none (wr_mas->mas)) { -mas_reset (wr_mas->mas); - }else { - wr_mas->r_max = wr_mas->mas->max; - wr_mas->type =mte_node_type (wr_mas->mas->node); -if (mas_is_span_wr (wr_mas)) -mas_reset (wr_mas->mas); - } - } +reset: +mas_reset (wr_mas->mas); }/* Interface */
_
Patches currently in -mm which might be from [email protected] are
maple_tree-add-hex-output-to-maple_arange64-dump.patch maple_tree-reorder-replacement-of-nodes-to-avoid-live-lock.patch maple_tree-introduce-mas_put_in_tree.patch maple_tree-introduce-mas_tree_parent-definition.patch maple_tree-change-mas_adopt_children-parent-usage.patch maple_tree-replace-data-before-marking-dead-in-split-and-spanning-store.patch