summaryrefslogtreecommitdiffstats
path: root/lib/maple_tree.c
diff options
context:
space:
mode:
authorJiazi Li <jqqlijiazi@gmail.com>2024-06-26 12:06:30 -0400
committerAndrew Morton <akpm@linux-foundation.org>2024-11-06 20:11:13 -0800
commit5b2100f723bd5c2b5552b27208f3e7d7447910d3 (patch)
tree1a6a3b691d612a28edc844c5d1db54d5e80b2355 /lib/maple_tree.c
parentmm/vmstat: defer the refresh_zone_stat_thresholds after all CPUs bringup (diff)
downloadlinux-5b2100f723bd5c2b5552b27208f3e7d7447910d3.tar.gz
linux-5b2100f723bd5c2b5552b27208f3e7d7447910d3.zip
maple_tree: fix alloc node fail issue
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>
Diffstat (limited to 'lib/maple_tree.c')
-rw-r--r--lib/maple_tree.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index a5e982e482dd..cdac15168405 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -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;