Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 11 Jan 2021 17:25:33 +0300
From:   "Kirill A. Shutemov" <kirill@shutemov.name>
To:     Will Deacon <will@kernel.org>
Cc:     linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        linux-arm-kernel@lists.infradead.org,
        Catalin Marinas <catalin.marinas@arm.com>,
        Jan Kara <jack@suse.cz>, Minchan Kim <minchan@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Vinayak Menon <vinmenon@codeaurora.org>,
        Hugh Dickins <hughd@google.com>, kernel-team@android.com
Subject: Re: [PATCH v2 2/3] mm: Allow architectures to request 'old' entries
 when prefaulting
Message-ID: <20210111142533.oulduqd76mkpdkst@box>
References: <20210108171517.5290-1-will@kernel.org>
 <20210108171517.5290-3-will@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210108171517.5290-3-will@kernel.org>
Precedence: bulk

On Fri, Jan 08, 2021 at 05:15:16PM +0000, Will Deacon wrote:
> diff --git a/mm/filemap.c b/mm/filemap.c
> index c1f2dc89b8a7..0fb9d1714797 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -3051,14 +3051,18 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf,
>  		if (!pte_none(*vmf->pte))
>  			goto unlock;
>  
> +		/* We're about to handle the fault */
> +		if (vmf->address == address) {
> +			vmf->flags &= ~FAULT_FLAG_PREFAULT;
> +			ret = VM_FAULT_NOPAGE;
> +		} else {
> +			vmf->flags |= FAULT_FLAG_PREFAULT;
> +		}
> +

Do we need to restore the oririnal status of the bit once we are done?

-- 
 Kirill A. Shutemov