The patch titled
Subject: mm: fail prefaulting if page table allocation fails
has been added to the -mm tree. Its filename is
mm-fail-prefaulting-if-page-table-allocation-fails.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-fail-prefaulting-if-page-table-allocation-fails.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-fail-prefaulting-if-page-table-allocation-fails.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Vegard Nossum <vegard.nossum@xxxxxxxxxx>
Subject: mm: fail prefaulting if page table allocation fails
I ran into this:
BUG: sleeping function called from invalid context at mm/page_alloc.c:3784
in_atomic(): 0, irqs_disabled(): 0, pid: 1434, name: trinity-c1
2 locks held by trinity-c1/1434:
#0: (&mm->mmap_sem){......}, at: [<ffffffff810ce31e>] __do_page_fault+0x1ce/0x8f0
#1: (rcu_read_lock){......}, at: [<ffffffff81378f86>] filemap_map_pages+0xd6/0xdd0
CPU: 0 PID: 1434 Comm: trinity-c1 Not tainted 4.7.0+ #58
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014
ffff8800b662f698 ffff8800b662f548 ffffffff81d6d001 ffffffff83a61100
ffff8800b662f620 ffff8800b662f610 ffffffff81373fd1 0000000041b58ab3
ffffffff8406ca21 ffffffff81373e4c 0000000041b58ab3 ffffffff00000008
Call Trace:
[<ffffffff81d6d001>] dump_stack+0x65/0x84
[<ffffffff81373fd1>] panic+0x185/0x2dd
[<ffffffff8118e38c>] ___might_sleep+0x51c/0x600
[<ffffffff8118e500>] __might_sleep+0x90/0x1a0
[<ffffffff81392761>] __alloc_pages_nodemask+0x5b1/0x2160
[<ffffffff814665ac>] alloc_pages_current+0xcc/0x370
[<ffffffff810d95b2>] pte_alloc_one+0x12/0x90
[<ffffffff814053cd>] __pte_alloc+0x1d/0x200
[<ffffffff8140be4e>] alloc_set_pte+0xe3e/0x14a0
[<ffffffff813792db>] filemap_map_pages+0x42b/0xdd0
[<ffffffff8140e0d5>] handle_mm_fault+0x17d5/0x28b0
[<ffffffff810ce460>] __do_page_fault+0x310/0x8f0
[<ffffffff810cec7d>] trace_do_page_fault+0x18d/0x310
[<ffffffff810c2177>] do_async_page_fault+0x27/0xa0
[<ffffffff8389e258>] async_page_fault+0x28/0x30
The important bits from the above is that filemap_map_pages() is calling
into the page allocator while holding rcu_read_lock (sleeping is not
allowed inside RCU read-side critical sections).
According to Kirill Shutemov, the prefaulting code in do_fault_around()
is supposed to take care of this, but missing error handling means that
the allocation failure can go unnoticed.
We don't need to return VM_FAULT_OOM (or any other error) here, since we
can just let the normal fault path try again.
Fixes: 7267ec008b5c ("mm: postpone page table allocation until we have page to map")
Link: http://lkml.kernel.org/r/1469708107-11868-1-git-send-email-vegard.nossum@xxxxxxxxxx
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxxx>
Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: "Hillf Danton" <hillf.zj@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN mm/memory.c~mm-fail-prefaulting-if-page-table-allocation-fails mm/memory.c
--- a/mm/memory.c~mm-fail-prefaulting-if-page-table-allocation-fails
+++ a/mm/memory.c
@@ -3133,6 +3133,8 @@ static int do_fault_around(struct fault_
if (pmd_none(*fe->pmd)) {
fe->prealloc_pte = pte_alloc_one(fe->vma->vm_mm, fe->address);
+ if (!fe->prealloc_pte)
+ goto out;
smp_wmb(); /* See comment in __pte_alloc() */
}
_
Patches currently in -mm which might be from vegard.nossum@xxxxxxxxxx are
mm-fail-prefaulting-if-page-table-allocation-fails.patch
kcov-allow-more-fine-grained-coverage-instrumentation.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
