diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2017-02-22 15:46:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-22 16:41:30 -0800 |
| commit | 235190738aba7c5c94300c8d882842a535280e5a (patch) | |
| tree | 248190ec7e28752ff5971bf9be7dcb9a1b3faefe /mm/oom_kill.c | |
| parent | ecf1385d72f0491400a8ceca7001196ca369aa8c (diff) | |
| download | linux-stable-235190738aba7c5c94300c8d882842a535280e5a.tar.gz linux-stable-235190738aba7c5c94300c8d882842a535280e5a.tar.bz2 linux-stable-235190738aba7c5c94300c8d882842a535280e5a.zip | |
oom-reaper: use madvise_dontneed() logic to decide if unmap the VMA
Logic on whether we can reap pages from the VMA should match what we
have in madvise_dontneed(). In particular, we should skip, VM_PFNMAP
VMAs, but we don't now.
Let's just extract condition on which we can shoot down pagesi from a
VMA with MADV_DONTNEED into separate function and use it in both places.
Link: http://lkml.kernel.org/r/20170118122429.43661-4-kirill.shutemov@linux.intel.com
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/oom_kill.c')
| -rw-r--r-- | mm/oom_kill.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index a1977247c7ea..8256788ac119 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -508,14 +508,7 @@ static bool __oom_reap_task_mm(struct task_struct *tsk, struct mm_struct *mm) tlb_gather_mmu(&tlb, mm, 0, -1); for (vma = mm->mmap ; vma; vma = vma->vm_next) { - if (is_vm_hugetlb_page(vma)) - continue; - - /* - * mlocked VMAs require explicit munlocking before unmap. - * Let's keep it simple here and skip such VMAs. - */ - if (vma->vm_flags & VM_LOCKED) + if (!can_madv_dontneed_vma(vma)) continue; /* |