From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752338AbcAFPnP (ORCPT ); Wed, 6 Jan 2016 10:43:15 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35313 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752283AbcAFPnM (ORCPT ); Wed, 6 Jan 2016 10:43:12 -0500 From: Michal Hocko To: Andrew Morton Cc: Mel Gorman , Tetsuo Handa , David Rientjes , Linus Torvalds , Oleg Nesterov , Hugh Dickins , Andrea Argangeli , Rik van Riel , , LKML , Michal Hocko Subject: [PATCH 2/2] oom reaper: handle anonymous mlocked pages Date: Wed, 6 Jan 2016 16:42:55 +0100 Message-Id: <1452094975-551-3-git-send-email-mhocko@kernel.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452094975-551-1-git-send-email-mhocko@kernel.org> References: <1452094975-551-1-git-send-email-mhocko@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michal Hocko __oom_reap_vmas current skips over all mlocked vmas because they need a special treatment before they are unmapped. This is primarily done for simplicity. There is no reason to skip over them for all mappings though and reduce the amount of reclaimed memory. Anonymous mappings are not visible by any other process so doing a munlock before unmap is safe to do from the semantic point of view. munlock_vma_pages_all is also safe to be called from the oom reaper context because it doesn't sit on any locks but mmap_sem (for read). Signed-off-by: Michal Hocko --- mm/oom_kill.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 1ece40b94725..913b68a44fd4 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -445,11 +445,16 @@ static bool __oom_reap_vmas(struct mm_struct *mm) continue; /* - * mlocked VMAs require explicit munlocking before unmap. - * Let's keep it simple here and skip such VMAs. + * mlocked VMAs require explicit munlocking before unmap + * and that is safe only for anonymous mappings because + * nobody except for the victim will need them locked */ - if (vma->vm_flags & VM_LOCKED) - continue; + if (vma->vm_flags & VM_LOCKED) { + if (vma_is_anonymous(vma)) + munlock_vma_pages_all(vma); + else + continue; + } /* * Only anonymous pages have a good chance to be dropped -- 2.6.4