maple_tree: fix alloc node fail issue
authorJiazi Li <jqqlijiazi@gmail.com>
Wed, 26 Jun 2024 16:06:30 +0000 (12:06 -0400)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 7 Nov 2024 04:11:13 +0000 (20:11 -0800)
In the following code, the second call to the mas_node_count will return
-ENOMEM:

mas_node_count(mas, MAPLE_ALLOC_SLOTS + 1);
mas_node_count(mas, MAPLE_ALLOC_SLOTS * 2 + 2);

This is because there may be some full maple_alloc node in current maple
state.  Use full maple_alloc node will make max_req equal to 0.  And it
leads to mt_alloc_bulk return 0.  As a result, mas_node_count set mas.node
to MA_ERROR(-ENOMEM).

Find a non-full maple_alloc node, and if necessary, use this non-full node
in the next while loop.

Link: https://lkml.kernel.org/r/20240626160631.3636515-1-Liam.Howlett@oracle.com
Fixes: 54a611b60590 ("Maple Tree: add new data structure")
Signed-off-by: Jiazi Li <jqqlijiazi@gmail.com>
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Suggested-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Reviewed-by: Wei Yang <richard.weiyang@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
lib/maple_tree.c

index a5e982e482dd4766914a913fbdbbfe843413f467..cdac15168405b33210ca91827e0ec28fabb7571f 100644 (file)
@@ -1285,7 +1285,10 @@ static inline void mas_alloc_nodes(struct ma_state *mas, gfp_t gfp)
 
                node->node_count += count;
                allocated += count;
-               node = node->slot[0];
+               /* find a non-full node*/
+               do {
+                       node = node->slot[0];
+               } while (unlikely(node->node_count == MAPLE_ALLOC_SLOTS));
                requested -= count;
        }
        mas->alloc->total = allocated;