From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756386AbbLAVER (ORCPT <rfc822;w@1wt.eu>);
	Tue, 1 Dec 2015 16:04:17 -0500
Received: from mga11.intel.com ([192.55.52.93]:38882 "EHLO mga11.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755191AbbLAVEP (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 1 Dec 2015 16:04:15 -0500
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.20,370,1444719600"; 
   d="scan'208";a="851723935"
Date: Tue, 1 Dec 2015 23:04:11 +0200
From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Dave Hansen <dave.hansen@intel.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        Hugh Dickins <hughd@google.com>,
        Andrea Arcangeli <aarcange@redhat.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Vlastimil Babka <vbabka@suse.cz>, Christoph Lameter <cl@gentwo.org>,
        Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>,
        Jerome Marchand <jmarchan@redhat.com>, linux-kernel@vger.kernel.org,
        linux-mm@kvack.org
Subject: Re: [PATCH 3/9] mm: postpone page table allocation until do_set_pte()
Message-ID: <20151201210411.GB135984@black.fi.intel.com>
References: <1447889136-6928-1-git-send-email-kirill.shutemov@linux.intel.com>
 <1447889136-6928-4-git-send-email-kirill.shutemov@linux.intel.com>
 <565E08C5.8090607@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <565E08C5.8090607@intel.com>
User-Agent: Mutt/1.5.23.1 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Dec 01, 2015 at 12:53:25PM -0800, Dave Hansen wrote:
> On 11/18/2015 03:25 PM, Kirill A. Shutemov wrote:
> > --- a/mm/filemap.c
> > +++ b/mm/filemap.c
> > @@ -2068,11 +2068,6 @@ void filemap_map_pages(struct fault_env *fe,
> ...
> >  		if (file->f_ra.mmap_miss > 0)
> >  			file->f_ra.mmap_miss--;
> > -		do_set_pte(fe, page);
> > +
> > +		fe->address += (iter.index - last_pgoff) << PAGE_SHIFT;
> > +		if (fe->pte)
> > +			fe->pte += iter.index - last_pgoff;
> > +		last_pgoff = iter.index;
> > +		if (do_set_pte(fe, NULL, page)) {
> > +			/* failed to setup page table: giving up */
> > +			if (!fe->pte)
> > +				break;
> > +			goto unlock;
> > +		}
> >  		unlock_page(page);
> >  		goto next;
> 
> Hey Kirill,
> 
> Is there a case here where do_set_pte() returns an error and _still_
> manages to populate fe->pte?

Yes. If the page is already mapped, we will get VM_FAULT_NOPAGE:

do_set_pte()
  pte_alloc_one_map()
    !pmd_none(*fe->pmd) => goto map_pte;
    fe->pte = pte_offset_map_lock()
  !pte_none(*fe->pte) => return VM_FAULT_NOPAGE;

-- 
 Kirill A. Shutemov