Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755089AbbK0QjJ (ORCPT ); Fri, 27 Nov 2015 11:39:09 -0500 Received: from mx2.suse.de ([195.135.220.15]:44924 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754834AbbK0QjG (ORCPT ); Fri, 27 Nov 2015 11:39:06 -0500 Date: Fri, 27 Nov 2015 16:39:00 +0000 From: Mel Gorman To: Michal Hocko Cc: linux-mm@kvack.org, Andrew Morton , Linus Torvalds , David Rientjes , Tetsuo Handa , Rik van Riel , Hugh Dickins , Oleg Nesterov , Andrea Argangeli , LKML , Michal Hocko Subject: Re: [RFC PATCH -v2] mm, oom: introduce oom reaper Message-ID: <20151127163900.GY19677@suse.de> References: <1448467018-20603-1-git-send-email-mhocko@kernel.org> <1448640772-30147-1-git-send-email-mhocko@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <1448640772-30147-1-git-send-email-mhocko@kernel.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2520 Lines: 75 On Fri, Nov 27, 2015 at 05:12:52PM +0100, Michal Hocko wrote: > From: Michal Hocko > > This is based on the idea from Mel Gorman discussed during LSFMM 2015 and > independently brought up by Oleg Nesterov. > > > > Signed-off-by: Michal Hocko Other than a few small issues below, I didn't spot anything out of the ordinary so Acked-by: Mel Gorman > + tlb_gather_mmu(&tlb, mm, 0, -1); > + for (vma = mm->mmap ; vma; vma = vma->vm_next) { > + if (is_vm_hugetlb_page(vma)) > + continue; > + > + /* > + * Only anonymous pages have a good chance to be dropped > + * without additional steps which we cannot afford as we > + * are OOM already. > + */ > + if (vma_is_anonymous(vma) || !(vma->vm_flags & VM_SHARED)) > + unmap_page_range(&tlb, vma, vma->vm_start, vma->vm_end, > + &details); > + } Care to add a comment why clean file pages should not be discarded? I'm assuming it's because you assume they were discarded already by normal reclaim before OOM. There is a slightly possibility they are been kept alive because the OOM victim is constantly referencing them so they get activated or that there might be additional work to discard buffers but I'm not 100% sure that's your logic. > @@ -421,6 +528,7 @@ void mark_oom_victim(struct task_struct *tsk) > /* OOM killer might race with memcg OOM */ > if (test_and_set_tsk_thread_flag(tsk, TIF_MEMDIE)) > return; > + > /* > * Make sure that the task is woken up from uninterruptible sleep > * if it is frozen because OOM killer wouldn't be able to free Unnecessary whitespace change. > @@ -607,15 +716,23 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p, > continue; > if (same_thread_group(p, victim)) > continue; > - if (unlikely(p->flags & PF_KTHREAD)) > - continue; > - if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) > + if (unlikely(p->flags & PF_KTHREAD) || > + p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) { > + /* > + * We cannot usee oom_reaper for the mm shared by this process > + * because it wouldn't get killed and so the memory might be > + * still used. > + */ > + can_oom_reap = false; > continue; s/usee/use/ -- Mel Gorman SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/