[PATCH] maple_tree: Remove rcu_read_lock() from mt_validate()
Hillf Danton
hdanton at sina.com
Tue Aug 20 15:38:45 PDT 2024
On Tue, 20 Aug 2024 13:54:17 -0400 "Liam R. Howlett" <Liam.Howlett at Oracle.com>
>
> The write lock should be held when validating the tree to avoid updates
> racing with checks. Holding the rcu read lock during a large tree
> validation may also cause a prolonged rcu read window.
>
>From the rcu stall's view, holding spin lock plays the same role of rcu
read lock, so what are you fixing by simply dropping rcu read lock?
> Link: https://lore.kernel.org/all/0000000000001d12d4062005aea1@google.com/
> Fixes: 54a611b60590 ("Maple Tree: add new data structure")
> Signed-off-by: Liam R. Howlett <Liam.Howlett at Oracle.com>
> Reported-by: syzbot+036af2f0c7338a33b0cd at syzkaller.appspotmail.com
> ---
> lib/maple_tree.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index 755ba8b18e14..fe1b01b29201 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -7588,14 +7588,14 @@ static void mt_validate_nulls(struct maple_tree *mt)
> * 2. The gap is correctly set in the parents
> */
> void mt_validate(struct maple_tree *mt)
> + __must_hold(mas->tree->ma_lock)
> {
> unsigned char end;
>
lockdep_assert_held(ma_lock); instead
> MA_STATE(mas, mt, 0, 0);
> - rcu_read_lock();
> mas_start(&mas);
> if (!mas_is_active(&mas))
> - goto done;
> + return;
>
> while (!mte_is_leaf(mas.node))
> mas_descend(&mas);
> @@ -7616,9 +7616,6 @@ void mt_validate(struct maple_tree *mt)
> mas_dfs_postorder(&mas, ULONG_MAX);
> }
> mt_validate_nulls(mt);
> -done:
> - rcu_read_unlock();
> -
> }
> EXPORT_SYMBOL_GPL(mt_validate);
>
> --
> 2.43.0
More information about the maple-tree
mailing list