Skip to content

Commit 3c769fd

Browse files
zhangpeng-00akpm00
authored andcommitted
maple_tree: set the node limit when creating a new root node
Set the node limit of the root node so that the last pivot of all nodes is the node limit (if the node is not full). This patch also fixes a bug in mas_rev_awalk(). Effectively, always setting a maximum makes mas_logical_pivot() behave as mas_safe_pivot(). Without this fix, it is possible that very small tasks would fail to find the correct gap. Although this has not been observed with real tasks, it has been reported to happen in m68k nommu running the maple tree tests. Link: https://lkml.kernel.org/r/20230711035444.526-1-zhangpeng.00@bytedance.com Link: https://lore.kernel.org/linux-mm/CAMuHMdV4T53fOw7VPoBgPR7fP6RYqf=CBhD_y_vOg53zZX_DnA@mail.gmail.com/ Link: https://lkml.kernel.org/r/20230711035444.526-2-zhangpeng.00@bytedance.com Fixes: 54a611b ("Maple Tree: add new data structure") Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com> Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com> Tested-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 2658f94 commit 3c769fd

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

lib/maple_tree.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3692,7 +3692,8 @@ static inline int mas_root_expand(struct ma_state *mas, void *entry)
36923692
mas->offset = slot;
36933693
pivots[slot] = mas->last;
36943694
if (mas->last != ULONG_MAX)
3695-
slot++;
3695+
pivots[++slot] = ULONG_MAX;
3696+
36963697
mas->depth = 1;
36973698
mas_set_height(mas);
36983699
ma_set_meta(node, maple_leaf_64, 0, slot);

0 commit comments

Comments
 (0)