diff mbox series

[RESEND,1/8] maple_tree: set the node limit when creating a new root node

Message ID 20230707101057.29326-2-zhangpeng.00@bytedance.com
State New
Headers
Series Improve the validation for maple tree and some cleanup |

Commit Message

Peng Zhang July 7, 2023, 10:10 a.m. UTC 
  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).

Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
---
 lib/maple_tree.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Liam R. Howlett July 7, 2023, 3:18 p.m. UTC | #1 
* Peng Zhang <zhangpeng.00@bytedance.com> [230707 06:11]:
> 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).
> 
> Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>

This has been on my list of things to do for a while, thanks.

Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>

> ---
>  lib/maple_tree.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index d3072858c280..f55e59bd9122 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -3692,7 +3692,8 @@ static inline int mas_root_expand(struct ma_state *mas, void *entry)
>  	mas->offset = slot;
>  	pivots[slot] = mas->last;
>  	if (mas->last != ULONG_MAX)
> -		slot++;
> +		pivots[++slot] = ULONG_MAX;
> +
>  	mas->depth = 1;
>  	mas_set_height(mas);
>  	ma_set_meta(node, maple_leaf_64, 0, slot);
> -- 
> 2.20.1
> 
>
Liam R. Howlett July 10, 2023, 3:05 p.m. UTC | #2 
* Liam R. Howlett <Liam.Howlett@Oracle.com> [230707 11:18]:
> * Peng Zhang <zhangpeng.00@bytedance.com> [230707 06:11]:
> > 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://lore.kernel.org/linux-mm/CAMuHMdV4T53fOw7VPoBgPR7fP6RYqf=CBhD_y_vOg53zZX_DnA@mail.gmail.com/
Cc: <stable@vger.kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>

> > 
> > Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
> 
> This has been on my list of things to do for a while, thanks.
> 
> Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
> 
> > ---
> >  lib/maple_tree.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> > index d3072858c280..f55e59bd9122 100644
> > --- a/lib/maple_tree.c
> > +++ b/lib/maple_tree.c
> > @@ -3692,7 +3692,8 @@ static inline int mas_root_expand(struct ma_state *mas, void *entry)
> >  	mas->offset = slot;
> >  	pivots[slot] = mas->last;
> >  	if (mas->last != ULONG_MAX)
> > -		slot++;
> > +		pivots[++slot] = ULONG_MAX;
> > +
> >  	mas->depth = 1;
> >  	mas_set_height(mas);
> >  	ma_set_meta(node, maple_leaf_64, 0, slot);
> > -- 
> > 2.20.1
> > 
> >
Liam R. Howlett July 10, 2023, 3:07 p.m. UTC | #3 
... actually add Geert to the cc list.

* Liam R. Howlett <Liam.Howlett@Oracle.com> [230710 11:06]:
> * Liam R. Howlett <Liam.Howlett@Oracle.com> [230707 11:18]:
> > * Peng Zhang <zhangpeng.00@bytedance.com> [230707 06:11]:
> > > 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://lore.kernel.org/linux-mm/CAMuHMdV4T53fOw7VPoBgPR7fP6RYqf=CBhD_y_vOg53zZX_DnA@mail.gmail.com/
> Cc: <stable@vger.kernel.org>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> 
> > > 
> > > Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
> > 
> > This has been on my list of things to do for a while, thanks.
> > 
> > Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
> > 
> > > ---
> > >  lib/maple_tree.c | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> > > index d3072858c280..f55e59bd9122 100644
> > > --- a/lib/maple_tree.c
> > > +++ b/lib/maple_tree.c
> > > @@ -3692,7 +3692,8 @@ static inline int mas_root_expand(struct ma_state *mas, void *entry)
> > >  	mas->offset = slot;
> > >  	pivots[slot] = mas->last;
> > >  	if (mas->last != ULONG_MAX)
> > > -		slot++;
> > > +		pivots[++slot] = ULONG_MAX;
> > > +
> > >  	mas->depth = 1;
> > >  	mas_set_height(mas);
> > >  	ma_set_meta(node, maple_leaf_64, 0, slot);
> > > -- 
> > > 2.20.1
> > > 
> > > 
> 
> -- 
> maple-tree mailing list
> maple-tree@lists.infradead.org
> https://lists.infradead.org/mailman/listinfo/maple-tree
diff mbox series

Patch

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index d3072858c280..f55e59bd9122 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3692,7 +3692,8 @@  static inline int mas_root_expand(struct ma_state *mas, void *entry)
 	mas->offset = slot;
 	pivots[slot] = mas->last;
 	if (mas->last != ULONG_MAX)
-		slot++;
+		pivots[++slot] = ULONG_MAX;
+
 	mas->depth = 1;
 	mas_set_height(mas);
 	ma_set_meta(node, maple_leaf_64, 0, slot);