Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

maple_tree: add end of node tracking to the maple state

Browse Source 
Analysis of the mas_for_each() iteration showed that there is a
significant time spent finding the end of a node.  This time can be
greatly reduced if the end of the node is cached in the maple state.  Care
must be taken to update & invalidate as necessary.

Link: https://lkml.kernel.org/r/20231101171629.3612299-5-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Peng Zhang <zhangpeng.00@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Liam R. Howlett 2023-11-01 13:16:21 -04:00 committed by Andrew Morton
parent bf857ddd21
commit 31c532a8af
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/maple_tree.h
View File

@ -393,6 +393,7 @@ struct ma_state {
unsigned char depth; /* depth of tree descent during write */ unsigned char depth; /* depth of tree descent during write */
unsigned char offset; unsigned char offset;
unsigned char mas_flags; unsigned char mas_flags;
unsigned char end; /* The end of the node */
}; };
struct ma_wr_state { struct ma_wr_state {

7
lib/maple_tree.c
View File

@ -2841,6 +2841,7 @@ next:
goto dead_node; goto dead_node;
} while (!ma_is_leaf(type)); } while (!ma_is_leaf(type));
mas->end = end;
mas->offset = offset; mas->offset = offset;
mas->index = min; mas->index = min;
mas->last = max; mas->last = max;
@ -3507,6 +3508,7 @@ static noinline_for_kasan int mas_commit_b_node(struct ma_wr_state *wr_mas,
mas_replace_node(wr_mas->mas, old_enode); mas_replace_node(wr_mas->mas, old_enode);
reuse_node: reuse_node:
mas_update_gap(wr_mas->mas); mas_update_gap(wr_mas->mas);
wr_mas->mas->end = b_end;
return 1; return 1;
} }
@ -4010,6 +4012,7 @@ done:
} }
trace_ma_write(__func__, mas, 0, wr_mas->entry); trace_ma_write(__func__, mas, 0, wr_mas->entry);
mas_update_gap(mas); mas_update_gap(mas);
mas->end = new_end;
return true; return true;
} }
@ -4190,6 +4193,7 @@ static inline bool mas_wr_append(struct ma_wr_state *wr_mas,
if (!wr_mas->content || !wr_mas->entry) if (!wr_mas->content || !wr_mas->entry)
mas_update_gap(mas); mas_update_gap(mas);
mas->end = new_end;
trace_ma_write(__func__, mas, new_end, wr_mas->entry); trace_ma_write(__func__, mas, new_end, wr_mas->entry);
return true; return true;
} }
@ -4428,6 +4432,7 @@ static inline int mas_prev_node(struct ma_state *mas, unsigned long min)
if (unlikely(mte_dead_node(mas->node))) if (unlikely(mte_dead_node(mas->node)))
return 1; return 1;
mas->end = mas->offset;
return 0; return 0;
no_entry: no_entry:
@ -5074,6 +5079,7 @@ int mas_empty_area(struct ma_state *mas, unsigned long min,
if (mas->index < min) if (mas->index < min)
mas->index = min; mas->index = min;
mas->last = mas->index + size - 1; mas->last = mas->index + size - 1;
mas->end = mas_data_end(mas);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(mas_empty_area); EXPORT_SYMBOL_GPL(mas_empty_area);
@ -5134,6 +5140,7 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min,
mas->last = max; mas->last = max;
mas->index = mas->last - size + 1; mas->index = mas->last - size + 1;
mas->end = mas_data_end(mas);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(mas_empty_area_rev); EXPORT_SYMBOL_GPL(mas_empty_area_rev);

1
tools/testing/radix-tree/maple.c
View File

@ -945,6 +945,7 @@ retry:
goto retry; goto retry;
} }
mas->end = mas_data_end(mas);
return ret; return ret;
not_found: not_found: