2023-01-09 17:28:08

by Liam R. Howlett

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

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/[email protected]/
Reported-by: SeongJae Park <[email protected]>
Signed-off-by: Liam R. Howlett <[email protected]>
---
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

2023-01-09 19:41:16

by SeongJae Park

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

On Mon, 9 Jan 2023 16:55:42 +0000 Liam Howlett <[email protected]> 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/[email protected]/
> Reported-by: SeongJae Park <[email protected]>
> Signed-off-by: Liam R. Howlett <[email protected]>

Tested-by: SeongJae Park <[email protected]>

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
>

2023-01-09 23:54:58

by SeongJae Park

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

Hi Andrew,

On Mon, 9 Jan 2023 15:40:12 -0800 Andrew Morton <[email protected]> wrote:

> On Mon, 9 Jan 2023 19:22:48 +0000 SeongJae Park <[email protected]> wrote:
>
> > On Mon, 9 Jan 2023 16:55:42 +0000 Liam Howlett <[email protected]> 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.
>
> Can we think of a Fixes: for this?
>
> > > Link: https://lore.kernel.org/all/[email protected]/
> > > Reported-by: SeongJae Park <[email protected]>
> > > Signed-off-by: Liam R. Howlett <[email protected]>
> >
> > Tested-by: SeongJae Park <[email protected]>
> >
> > I confirmed this patch fixes the boot failure issue. Nevertheless, the 'make
> > install' issue on my system is still not fixed.
>
> Is this a mainline issue or an mm-unstable issue?

It's mm-unstable issue:
https://lore.kernel.org/linux-mm/[email protected]/


Thanks,
SJ

2023-01-09 23:56:59

by Andrew Morton

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

On Mon, 9 Jan 2023 19:22:48 +0000 SeongJae Park <[email protected]> wrote:

> On Mon, 9 Jan 2023 16:55:42 +0000 Liam Howlett <[email protected]> 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.

Can we think of a Fixes: for this?

> > Link: https://lore.kernel.org/all/[email protected]/
> > Reported-by: SeongJae Park <[email protected]>
> > Signed-off-by: Liam R. Howlett <[email protected]>
>
> Tested-by: SeongJae Park <[email protected]>
>
> I confirmed this patch fixes the boot failure issue. Nevertheless, the 'make
> install' issue on my system is still not fixed.

Is this a mainline issue or an mm-unstable issue?

2023-01-10 14:48:15

by Liam R. Howlett

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

* SeongJae Park <[email protected]> [230109 18:43]:
> Hi Andrew,
>
> On Mon, 9 Jan 2023 15:40:12 -0800 Andrew Morton <[email protected]> wrote:
>
> > On Mon, 9 Jan 2023 19:22:48 +0000 SeongJae Park <[email protected]> wrote:
> >
> > > On Mon, 9 Jan 2023 16:55:42 +0000 Liam Howlett <[email protected]> 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.
> >
> > Can we think of a Fixes: for this?

It wasn't really an issue until I wrote the vma iterator store
function.

You can put this before (mm-unstable git id..)
9df3d25a97ec ("mm: expand vma iterator interface")

> >
> > > > Link: https://lore.kernel.org/all/[email protected]/
> > > > Reported-by: SeongJae Park <[email protected]>
> > > > Signed-off-by: Liam R. Howlett <[email protected]>
> > >
> > > Tested-by: SeongJae Park <[email protected]>
> > >
> > > I confirmed this patch fixes the boot failure issue. Nevertheless, the 'make
> > > install' issue on my system is still not fixed.
> >
> > Is this a mainline issue or an mm-unstable issue?
>
> It's mm-unstable issue:
> https://lore.kernel.org/linux-mm/[email protected]/

Yes, just mm-unstable.

2023-01-11 00:16:27

by Andrew Morton

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

On Tue, 10 Jan 2023 14:21:15 +0000 Liam Howlett <[email protected]> wrote:

> * SeongJae Park <[email protected]> [230109 18:43]:
> > Hi Andrew,
> >
> > On Mon, 9 Jan 2023 15:40:12 -0800 Andrew Morton <[email protected]> wrote:
> >
> > > On Mon, 9 Jan 2023 19:22:48 +0000 SeongJae Park <[email protected]> wrote:
> > >
> > > > On Mon, 9 Jan 2023 16:55:42 +0000 Liam Howlett <[email protected]> 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.
> > >
> > > Can we think of a Fixes: for this?
>
> It wasn't really an issue until I wrote the vma iterator store
> function.
>
> You can put this before (mm-unstable git id..)
> 9df3d25a97ec ("mm: expand vma iterator interface")

I have dropped "mm: expand vma iterator interface"'s series. Should we
retain this patch as a standalone thing and is the changelog still
appropriate?

2023-01-11 01:35:28

by Liam R. Howlett

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

* Andrew Morton <[email protected]> [230110 18:18]:
> On Tue, 10 Jan 2023 14:21:15 +0000 Liam Howlett <[email protected]> wrote:
>
> > * SeongJae Park <[email protected]> [230109 18:43]:
> > > Hi Andrew,
> > >
> > > On Mon, 9 Jan 2023 15:40:12 -0800 Andrew Morton <[email protected]> wrote:
> > >
> > > > On Mon, 9 Jan 2023 19:22:48 +0000 SeongJae Park <[email protected]> wrote:
> > > >
> > > > > On Mon, 9 Jan 2023 16:55:42 +0000 Liam Howlett <[email protected]> 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.
> > > >
> > > > Can we think of a Fixes: for this?
> >
> > It wasn't really an issue until I wrote the vma iterator store
> > function.
> >
> > You can put this before (mm-unstable git id..)
> > 9df3d25a97ec ("mm: expand vma iterator interface")
>
> I have dropped "mm: expand vma iterator interface"'s series. Should we
> retain this patch as a standalone thing and is the changelog still
> appropriate?

No, just drop it and I'll re-spin v3 to include maple tree fixes on the
top.