* FAILED: patch "[PATCH] mm/memory-failure.c: don't access uninitialized memmaps in" failed to apply to 4.14-stable tree
@ 2019-10-27 13:41 gregkh
2019-10-28 8:44 ` Sasha Levin
0 siblings, 1 reply; 4+ messages in thread
From: gregkh @ 2019-10-27 13:41 UTC (permalink / raw)
To: david, akpm, mhocko, n-horiguchi, stable, torvalds; +Cc: stable
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 96c804a6ae8c59a9092b3d5dd581198472063184 Mon Sep 17 00:00:00 2001
From: David Hildenbrand <david@redhat.com>
Date: Fri, 18 Oct 2019 20:19:23 -0700
Subject: [PATCH] mm/memory-failure.c: don't access uninitialized memmaps in
memory_failure()
We should check for pfn_to_online_page() to not access uninitialized
memmaps. Reshuffle the code so we don't have to duplicate the error
message.
Link: http://lkml.kernel.org/r/20191009142435.3975-3-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Fixes: f1dd2cd13c4b ("mm, memory_hotplug: do not associate hotadded memory to zones until online") [visible after d0dc12e86b319]
Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: <stable@vger.kernel.org> [4.13+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 0ae72b6acee7..3151c87dff73 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1257,17 +1257,19 @@ int memory_failure(unsigned long pfn, int flags)
if (!sysctl_memory_failure_recovery)
panic("Memory failure on page %lx", pfn);
- if (!pfn_valid(pfn)) {
+ p = pfn_to_online_page(pfn);
+ if (!p) {
+ if (pfn_valid(pfn)) {
+ pgmap = get_dev_pagemap(pfn, NULL);
+ if (pgmap)
+ return memory_failure_dev_pagemap(pfn, flags,
+ pgmap);
+ }
pr_err("Memory failure: %#lx: memory outside kernel control\n",
pfn);
return -ENXIO;
}
- pgmap = get_dev_pagemap(pfn, NULL);
- if (pgmap)
- return memory_failure_dev_pagemap(pfn, flags, pgmap);
-
- p = pfn_to_page(pfn);
if (PageHuge(p))
return memory_failure_hugetlb(pfn, flags);
if (TestSetPageHWPoison(p)) {
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: FAILED: patch "[PATCH] mm/memory-failure.c: don't access uninitialized memmaps in" failed to apply to 4.14-stable tree
2019-10-27 13:41 FAILED: patch "[PATCH] mm/memory-failure.c: don't access uninitialized memmaps in" failed to apply to 4.14-stable tree gregkh
@ 2019-10-28 8:44 ` Sasha Levin
2019-10-28 15:07 ` David Hildenbrand
0 siblings, 1 reply; 4+ messages in thread
From: Sasha Levin @ 2019-10-28 8:44 UTC (permalink / raw)
To: gregkh; +Cc: david, akpm, mhocko, n-horiguchi, stable, torvalds
On Sun, Oct 27, 2019 at 02:41:31PM +0100, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.14-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 96c804a6ae8c59a9092b3d5dd581198472063184 Mon Sep 17 00:00:00 2001
>From: David Hildenbrand <david@redhat.com>
>Date: Fri, 18 Oct 2019 20:19:23 -0700
>Subject: [PATCH] mm/memory-failure.c: don't access uninitialized memmaps in
> memory_failure()
>
>We should check for pfn_to_online_page() to not access uninitialized
>memmaps. Reshuffle the code so we don't have to duplicate the error
>message.
>
>Link: http://lkml.kernel.org/r/20191009142435.3975-3-david@redhat.com
>Signed-off-by: David Hildenbrand <david@redhat.com>
>Fixes: f1dd2cd13c4b ("mm, memory_hotplug: do not associate hotadded memory to zones until online") [visible after d0dc12e86b319]
>Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
>Cc: Michal Hocko <mhocko@kernel.org>
>Cc: <stable@vger.kernel.org> [4.13+]
>Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
I took in 83b57531c58f4 ("mm/memory_failure: Remove unused trapno from
memory_failure") for 4.14 to address this.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: FAILED: patch "[PATCH] mm/memory-failure.c: don't access uninitialized memmaps in" failed to apply to 4.14-stable tree
2019-10-28 8:44 ` Sasha Levin
@ 2019-10-28 15:07 ` David Hildenbrand
2019-10-28 15:39 ` Sasha Levin
0 siblings, 1 reply; 4+ messages in thread
From: David Hildenbrand @ 2019-10-28 15:07 UTC (permalink / raw)
To: Sasha Levin, gregkh; +Cc: akpm, mhocko, n-horiguchi, stable, torvalds
On 28.10.19 09:44, Sasha Levin wrote:
> On Sun, Oct 27, 2019 at 02:41:31PM +0100, gregkh@linuxfoundation.org wrote:
>>
>> The patch below does not apply to the 4.14-stable tree.
>> If someone wants it applied there, or to any other stable or longterm
>> tree, then please email the backport, including the original git commit
>> id to <stable@vger.kernel.org>.
>>
>> thanks,
>>
>> greg k-h
>>
>> ------------------ original commit in Linus's tree ------------------
>>
>>From 96c804a6ae8c59a9092b3d5dd581198472063184 Mon Sep 17 00:00:00 2001
>> From: David Hildenbrand <david@redhat.com>
>> Date: Fri, 18 Oct 2019 20:19:23 -0700
>> Subject: [PATCH] mm/memory-failure.c: don't access uninitialized memmaps in
>> memory_failure()
>>
>> We should check for pfn_to_online_page() to not access uninitialized
>> memmaps. Reshuffle the code so we don't have to duplicate the error
>> message.
>>
>> Link: http://lkml.kernel.org/r/20191009142435.3975-3-david@redhat.com
>> Signed-off-by: David Hildenbrand <david@redhat.com>
>> Fixes: f1dd2cd13c4b ("mm, memory_hotplug: do not associate hotadded memory to zones until online") [visible after d0dc12e86b319]
>> Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
>> Cc: Michal Hocko <mhocko@kernel.org>
>> Cc: <stable@vger.kernel.org> [4.13+]
>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>
> I took in 83b57531c58f4 ("mm/memory_failure: Remove unused trapno from
> memory_failure") for 4.14 to address this.
>
I guess that shouldn't be sufficient as we are missing the whole devmap
stuff? (at least not sufficient to cleanly cherry pick this patch)
The backport should be very simple, though. Did you already perform the
backport or shall I send one?
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: FAILED: patch "[PATCH] mm/memory-failure.c: don't access uninitialized memmaps in" failed to apply to 4.14-stable tree
2019-10-28 15:07 ` David Hildenbrand
@ 2019-10-28 15:39 ` Sasha Levin
0 siblings, 0 replies; 4+ messages in thread
From: Sasha Levin @ 2019-10-28 15:39 UTC (permalink / raw)
To: David Hildenbrand; +Cc: gregkh, akpm, mhocko, n-horiguchi, stable, torvalds
On Mon, Oct 28, 2019 at 04:07:10PM +0100, David Hildenbrand wrote:
>On 28.10.19 09:44, Sasha Levin wrote:
>>On Sun, Oct 27, 2019 at 02:41:31PM +0100, gregkh@linuxfoundation.org wrote:
>>>
>>>The patch below does not apply to the 4.14-stable tree.
>>>If someone wants it applied there, or to any other stable or longterm
>>>tree, then please email the backport, including the original git commit
>>>id to <stable@vger.kernel.org>.
>>>
>>>thanks,
>>>
>>>greg k-h
>>>
>>>------------------ original commit in Linus's tree ------------------
>>>
>>>From 96c804a6ae8c59a9092b3d5dd581198472063184 Mon Sep 17 00:00:00 2001
>>>From: David Hildenbrand <david@redhat.com>
>>>Date: Fri, 18 Oct 2019 20:19:23 -0700
>>>Subject: [PATCH] mm/memory-failure.c: don't access uninitialized memmaps in
>>>memory_failure()
>>>
>>>We should check for pfn_to_online_page() to not access uninitialized
>>>memmaps. Reshuffle the code so we don't have to duplicate the error
>>>message.
>>>
>>>Link: http://lkml.kernel.org/r/20191009142435.3975-3-david@redhat.com
>>>Signed-off-by: David Hildenbrand <david@redhat.com>
>>>Fixes: f1dd2cd13c4b ("mm, memory_hotplug: do not associate hotadded memory to zones until online") [visible after d0dc12e86b319]
>>>Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
>>>Cc: Michal Hocko <mhocko@kernel.org>
>>>Cc: <stable@vger.kernel.org> [4.13+]
>>>Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>>>Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>>
>>I took in 83b57531c58f4 ("mm/memory_failure: Remove unused trapno from
>>memory_failure") for 4.14 to address this.
>>
>
>I guess that shouldn't be sufficient as we are missing the whole
>devmap stuff? (at least not sufficient to cleanly cherry pick this
>patch)
>
>The backport should be very simple, though. Did you already perform
>the backport or shall I send one?
I did it, thank you :)
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-28 15:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-27 13:41 FAILED: patch "[PATCH] mm/memory-failure.c: don't access uninitialized memmaps in" failed to apply to 4.14-stable tree gregkh
2019-10-28 8:44 ` Sasha Levin
2019-10-28 15:07 ` David Hildenbrand
2019-10-28 15:39 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).