* Re: [PATCH v4.9.y] Fixes: Commit 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages")
2018-09-05 8:58 [PATCH v4.9.y] Fixes: Commit 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages") Chas Williams
@ 2018-09-05 9:05 ` Greg KH
2018-09-05 9:18 ` Nathan Chancellor
2018-09-05 14:43 ` [PATCH] Fixes: Commit 2aa6d036b716 " Chas Williams
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Greg KH @ 2018-09-05 9:05 UTC (permalink / raw)
To: Chas Williams; +Cc: stable, mark.rutland, Chas Williams
On Wed, Sep 05, 2018 at 04:58:52AM -0400, Chas Williams wrote:
> From: Chas Williams <chas3@att.com>
>
> Commit 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages")
> was an incomplete backport of the upstream commit. It is necessary to
> always reset page_nid before attempting any early exit.
> ---
> mm/huge_memory.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v4.9.y] Fixes: Commit 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages")
2018-09-05 9:05 ` Greg KH
@ 2018-09-05 9:18 ` Nathan Chancellor
[not found] ` <CAG2-Gkn69EFYV2XwBraSt2nPwxRh2i+vV-XRfzxsZH2_7cORhg@mail.gmail.com>
0 siblings, 1 reply; 12+ messages in thread
From: Nathan Chancellor @ 2018-09-05 9:18 UTC (permalink / raw)
To: Greg KH; +Cc: Chas Williams, stable, mark.rutland, Chas Williams
On Wed, Sep 05, 2018 at 11:05:15AM +0200, Greg KH wrote:
> On Wed, Sep 05, 2018 at 04:58:52AM -0400, Chas Williams wrote:
> > From: Chas Williams <chas3@att.com>
> >
> > Commit 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages")
> > was an incomplete backport of the upstream commit. It is necessary to
> > always reset page_nid before attempting any early exit.
> > ---
> > mm/huge_memory.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
>
> <formletter>
>
> This is not the correct way to submit patches for inclusion in the
> stable kernel tree. Please read:
> https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
> for how to do this properly.
>
> </formletter>
This is an issue with the 4.9 tree, not mainline. The hash is
incorrect but the problem appears valid.
Compare:
2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
from v4.9.36 with the upstream commit from 4.12:
3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages")
It is missing this diff.
The original commit conflicted due to lack of commit 82b0f8c39a38 ("mm:
join struct fault_env and vm_fault") in 4.9 so it wasn't a clean
application, must have just gotten lost in the noise.
Cheers,
Nathan
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] Fixes: Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
2018-09-05 8:58 [PATCH v4.9.y] Fixes: Commit 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages") Chas Williams
2018-09-05 9:05 ` Greg KH
@ 2018-09-05 14:43 ` Chas Williams
2018-09-05 15:02 ` Greg KH
2018-09-06 15:09 ` [PATCH][4.9.y] " Chas Williams
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Chas Williams @ 2018-09-05 14:43 UTC (permalink / raw)
To: stable; +Cc: mark.rutland, natechancellor, Chas Williams
From: Chas Williams <chas3@att.com>
Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
was an incomplete backport of the upstream commit. It is necessary to
always reset page_nid before attempting any early exit.
The original commit conflicted due to lack of commit 82b0f8c39a38
("mm: join struct fault_env and vm_fault") in 4.9 so it wasn't a clean
application, and the change must have just gotten lost in the noise.
Signed-off-by: Chas Williams <chas3@att.com>
---
mm/huge_memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 9efe88ef9702..e4c6c3edaf6a 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1259,12 +1259,12 @@ int do_huge_pmd_numa_page(struct fault_env *fe, pmd_t pmd)
/* Migration could have started since the pmd_trans_migrating check */
if (!page_locked) {
+ page_nid = -1;
if (!get_page_unless_zero(page))
goto out_unlock;
spin_unlock(fe->ptl);
wait_on_page_locked(page);
put_page(page);
- page_nid = -1;
goto out;
}
--
2.14.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] Fixes: Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
2018-09-05 14:43 ` [PATCH] Fixes: Commit 2aa6d036b716 " Chas Williams
@ 2018-09-05 15:02 ` Greg KH
2018-09-05 17:46 ` Chas Williams
0 siblings, 1 reply; 12+ messages in thread
From: Greg KH @ 2018-09-05 15:02 UTC (permalink / raw)
To: Chas Williams; +Cc: stable, mark.rutland, natechancellor, Chas Williams
On Wed, Sep 05, 2018 at 10:43:17AM -0400, Chas Williams wrote:
> From: Chas Williams <chas3@att.com>
>
> Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
> was an incomplete backport of the upstream commit. It is necessary to
> always reset page_nid before attempting any early exit.
>
> The original commit conflicted due to lack of commit 82b0f8c39a38
> ("mm: join struct fault_env and vm_fault") in 4.9 so it wasn't a clean
> application, and the change must have just gotten lost in the noise.
>
> Signed-off-by: Chas Williams <chas3@att.com>
> ---
> mm/huge_memory.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Much better, thanks!
But can you cc: the people involved in that first patch to get their
ack?
Also, what about 4.4.y and 3.18.y which had the original commit
backported as well? Do they also need this fix?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] Fixes: Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
2018-09-05 15:02 ` Greg KH
@ 2018-09-05 17:46 ` Chas Williams
0 siblings, 0 replies; 12+ messages in thread
From: Chas Williams @ 2018-09-05 17:46 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: stable, mark.rutland, natechancellor, Chas Williams
On Wed, Sep 5, 2018 at 11:03 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Wed, Sep 05, 2018 at 10:43:17AM -0400, Chas Williams wrote:
> > From: Chas Williams <chas3@att.com>
> >
> > Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
> > was an incomplete backport of the upstream commit. It is necessary to
> > always reset page_nid before attempting any early exit.
> >
> > The original commit conflicted due to lack of commit 82b0f8c39a38
> > ("mm: join struct fault_env and vm_fault") in 4.9 so it wasn't a clean
> > application, and the change must have just gotten lost in the noise.
> >
> > Signed-off-by: Chas Williams <chas3@att.com>
> > ---
> > mm/huge_memory.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Much better, thanks!
>
> But can you cc: the people involved in that first patch to get their
> ack?
>
> Also, what about 4.4.y and 3.18.y which had the original commit
> backported as well? Do they also need this fix?
Yes, both are broken.
> thanks,
>
> greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH][4.9.y] Fixes: Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
2018-09-05 8:58 [PATCH v4.9.y] Fixes: Commit 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages") Chas Williams
2018-09-05 9:05 ` Greg KH
2018-09-05 14:43 ` [PATCH] Fixes: Commit 2aa6d036b716 " Chas Williams
@ 2018-09-06 15:09 ` Chas Williams
2018-09-06 15:10 ` [PATCH][v3.18.y] Fixes: Commit 86af955d02bb " Chas Williams
2018-09-06 15:11 ` [PATCH][v4.4.y] Fixes: Commit cdbf92675fad " Chas Williams
4 siblings, 0 replies; 12+ messages in thread
From: Chas Williams @ 2018-09-06 15:09 UTC (permalink / raw)
To: stable
Cc: natechancellor, mark.rutland, will.deacon, steve.capper,
kirill.shutemov, vbabka, mgorman, Chas Williams
From: Chas Williams <chas3@att.com>
Commit 2aa6d036b716 ("mm: numa: avoid waiting on freed migrated pages")
was an incomplete backport of the upstream commit. It is necessary to
always reset page_nid before attempting any early exit.
The original commit conflicted due to lack of commit 82b0f8c39a38
("mm: join struct fault_env and vm_fault") in 4.9 so it wasn't a clean
application, and the change must have just gotten lost in the noise.
Signed-off-by: Chas Williams <chas3@att.com>
---
mm/huge_memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 9efe88ef9702..e4c6c3edaf6a 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1259,12 +1259,12 @@ int do_huge_pmd_numa_page(struct fault_env *fe, pmd_t pmd)
/* Migration could have started since the pmd_trans_migrating check */
if (!page_locked) {
+ page_nid = -1;
if (!get_page_unless_zero(page))
goto out_unlock;
spin_unlock(fe->ptl);
wait_on_page_locked(page);
put_page(page);
- page_nid = -1;
goto out;
}
--
2.14.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][v3.18.y] Fixes: Commit 86af955d02bb ("mm: numa: avoid waiting on freed migrated pages")
2018-09-05 8:58 [PATCH v4.9.y] Fixes: Commit 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages") Chas Williams
` (2 preceding siblings ...)
2018-09-06 15:09 ` [PATCH][4.9.y] " Chas Williams
@ 2018-09-06 15:10 ` Chas Williams
2018-09-06 15:11 ` [PATCH][v4.4.y] Fixes: Commit cdbf92675fad " Chas Williams
4 siblings, 0 replies; 12+ messages in thread
From: Chas Williams @ 2018-09-06 15:10 UTC (permalink / raw)
To: stable
Cc: natechancellor, mark.rutland, will.deacon, steve.capper,
kirill.shutemov, vbabka, mgorman, Chas Williams
From: Chas Williams <chas3@att.com>
Commit 86af955d02bb ("mm: numa: avoid waiting on freed migrated pages")
was an incomplete backport of the upstream commit. It is necessary to
always reset page_nid before attempting any early exit.
The original commit conflicted due to lack of commit 82b0f8c39a38
("mm: join struct fault_env and vm_fault") in 4.9 so it wasn't a clean
application, and the change must have just gotten lost in the noise.
Signed-off-by: Chas Williams <chas3@att.com>
---
mm/huge_memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 690d172436c4..bc402f39ac48 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1329,12 +1329,12 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
/* Migration could have started since the pmd_trans_migrating check */
if (!page_locked) {
+ page_nid = -1;
if (!get_page_unless_zero(page))
goto out_unlock;
spin_unlock(ptl);
wait_on_page_locked(page);
put_page(page);
- page_nid = -1;
goto out;
}
--
2.14.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][v4.4.y] Fixes: Commit cdbf92675fad ("mm: numa: avoid waiting on freed migrated pages")
2018-09-05 8:58 [PATCH v4.9.y] Fixes: Commit 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages") Chas Williams
` (3 preceding siblings ...)
2018-09-06 15:10 ` [PATCH][v3.18.y] Fixes: Commit 86af955d02bb " Chas Williams
@ 2018-09-06 15:11 ` Chas Williams
4 siblings, 0 replies; 12+ messages in thread
From: Chas Williams @ 2018-09-06 15:11 UTC (permalink / raw)
To: stable
Cc: natechancellor, mark.rutland, will.deacon, steve.capper,
kirill.shutemov, vbabka, mgorman, Chas Williams
From: Chas Williams <chas3@att.com>
Commit cdbf92675fad ("mm: numa: avoid waiting on freed migrated pages")
was an incomplete backport of the upstream commit. It is necessary to
always reset page_nid before attempting any early exit.
The original commit conflicted due to lack of commit 82b0f8c39a38
("mm: join struct fault_env and vm_fault") in 4.9 so it wasn't a clean
application, and the change must have just gotten lost in the noise.
Signed-off-by: Chas Williams <chas3@att.com>
---
mm/huge_memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 0127b788272f..c4ea57ee2fd1 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1393,12 +1393,12 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
/* Migration could have started since the pmd_trans_migrating check */
if (!page_locked) {
+ page_nid = -1;
if (!get_page_unless_zero(page))
goto out_unlock;
spin_unlock(ptl);
wait_on_page_locked(page);
put_page(page);
- page_nid = -1;
goto out;
}
--
2.14.4
^ permalink raw reply related [flat|nested] 12+ messages in thread