github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-13 06:23:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

maple_tree: add helper mas_make_walkable()

Browse Source 
A check in mas_walk() was incorrect and caused inefficient use of the
maple state.  The same issue existed in mas_erase(), but was left unfixed.
Making a helper function is the obvious answer.

Link: https://lore.kernel.org/20260821192627.4085470-20-liam@infradead.org
Signed-off-by: Liam R. Howlett (Oracle) <liam@infradead.org>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Breno Leitao <leitao@debian.org>
Cc: Chris Mason <clm@meta.com>
Cc: Chuck Lever <cel@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Joe Perches <joe@perches.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Waiman Long <longman@redhat.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Liam R. Howlett (Oracle) 2026-08-21 15:26:27 -04:00 committed by Andrew Morton
parent 4e4fe9d727
commit d17c749d32
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/maple_tree.c
View File

@ -261,6 +261,12 @@ static inline bool mas_is_underflow(struct ma_state *mas)
return mas->status == ma_underflow;
}
static inline void mas_make_walkable(struct ma_state *mas)
{
if (!mas_is_active(mas) && !mas_is_start(mas))
mas->status = ma_start;
}
static __always_inline struct maple_node *mte_to_node(
const struct maple_enode *entry)
{
@ -4447,8 +4453,7 @@ void *mas_walk(struct ma_state *mas)
void *entry;
mas_may_init_lock_check(mas);
if (!mas_is_active(mas) && !mas_is_start(mas))
mas->status = ma_start;
mas_make_walkable(mas);
retry:
entry = mas_state_walk(mas);
if (mas_is_start(mas)) {
@ -5685,9 +5690,7 @@ void *mas_erase(struct ma_state *mas)
if (mt_external_lock(mas->tree))
might_alloc(GFP_KERNEL);
if (!mas_is_active(mas) || !mas_is_start(mas))
mas->status = ma_start;
mas_make_walkable(mas);
write_retry:
entry = mas_state_walk(mas);
if (!entry)