Re: [PATCH] maple_tree: Fix handle of invalidated state in mas_wr_store_setup()

[SeongJae Park]

On Mon, 9 Jan 2023 16:55:42 +0000 Liam Howlett <liam.howlett@xxxxxxxxxx> wrote:

> If an invalidated maple state is encountered during write, reset the
> maple state to MAS_START.  This will result in a re-walk of the tree to
> the correct location for the write.
> 
> Link: https://lore.kernel.org/all/20230107020126.1627-1-sj@xxxxxxxxxx/
> Reported-by: SeongJae Park <sj@xxxxxxxxxx>
> Signed-off-by: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>

Tested-by: SeongJae Park <sj@xxxxxxxxxx>

I confirmed this patch fixes the boot failure issue.  Nevertheless, the 'make
install' issue on my system is still not fixed.


Thanks,
SJ

> ---
>  lib/maple_tree.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index 14cff87cf058..59c4879ac714 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -5620,6 +5620,9 @@ static inline void mte_destroy_walk(struct maple_enode *enode,
>  
>  static void mas_wr_store_setup(struct ma_wr_state *wr_mas)
>  {
> +	if (unlikely(mas_is_paused(wr_mas->mas)))
> +		mas_reset(wr_mas->mas);
> +
>  	if (!mas_is_start(wr_mas->mas)) {
>  		if (mas_is_none(wr_mas->mas)) {
>  			mas_reset(wr_mas->mas);
> -- 
> 2.35.1
>