From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754661Ab1BHAsK (ORCPT ); Mon, 7 Feb 2011 19:48:10 -0500 Received: from smtp-out.google.com ([216.239.44.51]:3044 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753369Ab1BHAsE (ORCPT ); Mon, 7 Feb 2011 19:48:04 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=google.com; s=beta; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=p/kbohI9Oq4Vk8wI5xg9iSAlMDxNCjEaHvNJkdFRQJyVUsmUrWLIb6tZouUAx9/mBL f8CcZmtvPI1Fl6AE8ZWw== From: Michel Lespinasse To: linux-mm@kvack.org, Lee Schermerhorn Cc: Andrew Morton , KAMEZAWA Hiroyuki , Hugh Dickins , Rik van Riel , Andrea Arcangeli , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] mlock: do not munlock pages in __do_fault() Date: Mon, 7 Feb 2011 16:47:36 -0800 Message-Id: <1297126056-14322-3-git-send-email-walken@google.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1297126056-14322-1-git-send-email-walken@google.com> References: <1297126056-14322-1-git-send-email-walken@google.com> X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the page is going to be written to, __do_page needs to break COW. However, the old page (before breaking COW) was never mapped mapped into the current pte (__do_fault is only called when the pte is not present), so vmscan can't have marked the old page as PageMlocked due to being mapped in __do_fault's VMA. Therefore, __do_fault() does not need to worry about clearing PageMlocked() on the old page. Signed-off-by: Michel Lespinasse --- mm/memory.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 32df03c..8e8c1832 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3051,12 +3051,6 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, goto out; } charged = 1; - /* - * Don't let another task, with possibly unlocked vma, - * keep the mlocked page. - */ - if (vma->vm_flags & VM_LOCKED) - clear_page_mlock(vmf.page); copy_user_highpage(page, vmf.page, address, vma); __SetPageUptodate(page); } else { -- 1.7.3.1