From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C09DBC00319 for ; Thu, 21 Feb 2019 17:29:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D02C2080D for ; Thu, 21 Feb 2019 17:29:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728559AbfBUR3Y (ORCPT ); Thu, 21 Feb 2019 12:29:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45644 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725831AbfBUR3Y (ORCPT ); Thu, 21 Feb 2019 12:29:24 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A128430821BE; Thu, 21 Feb 2019 17:29:23 +0000 (UTC) Received: from redhat.com (unknown [10.20.6.236]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 79F0319C58; Thu, 21 Feb 2019 17:29:21 +0000 (UTC) Date: Thu, 21 Feb 2019 12:29:19 -0500 From: Jerome Glisse To: Peter Xu Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand , Hugh Dickins , Maya Gokhale , Pavel Emelyanov , Johannes Weiner , Martin Cracauer , Shaohua Li , Marty McFadden , Andrea Arcangeli , Mike Kravetz , Denis Plotnikov , Mike Rapoport , Mel Gorman , "Kirill A . Shutemov" , "Dr . David Alan Gilbert" Subject: Re: [PATCH v2 10/26] userfaultfd: wp: add UFFDIO_COPY_MODE_WP Message-ID: <20190221172919.GJ2813@redhat.com> References: <20190212025632.28946-1-peterx@redhat.com> <20190212025632.28946-11-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190212025632.28946-11-peterx@redhat.com> User-Agent: Mutt/1.10.0 (2018-05-17) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 21 Feb 2019 17:29:23 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 12, 2019 at 10:56:16AM +0800, Peter Xu wrote: > From: Andrea Arcangeli > > This allows UFFDIO_COPY to map pages wrprotected. > > Signed-off-by: Andrea Arcangeli > Signed-off-by: Peter Xu Minor nitpick down below, but in any case: Reviewed-by: Jérôme Glisse > --- > fs/userfaultfd.c | 5 +++-- > include/linux/userfaultfd_k.h | 2 +- > include/uapi/linux/userfaultfd.h | 11 +++++----- > mm/userfaultfd.c | 36 ++++++++++++++++++++++---------- > 4 files changed, 35 insertions(+), 19 deletions(-) > [...] > diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c > index d59b5a73dfb3..73a208c5c1e7 100644 > --- a/mm/userfaultfd.c > +++ b/mm/userfaultfd.c > @@ -25,7 +25,8 @@ static int mcopy_atomic_pte(struct mm_struct *dst_mm, > struct vm_area_struct *dst_vma, > unsigned long dst_addr, > unsigned long src_addr, > - struct page **pagep) > + struct page **pagep, > + bool wp_copy) > { > struct mem_cgroup *memcg; > pte_t _dst_pte, *dst_pte; > @@ -71,9 +72,9 @@ static int mcopy_atomic_pte(struct mm_struct *dst_mm, > if (mem_cgroup_try_charge(page, dst_mm, GFP_KERNEL, &memcg, false)) > goto out_release; > > - _dst_pte = mk_pte(page, dst_vma->vm_page_prot); > - if (dst_vma->vm_flags & VM_WRITE) > - _dst_pte = pte_mkwrite(pte_mkdirty(_dst_pte)); > + _dst_pte = pte_mkdirty(mk_pte(page, dst_vma->vm_page_prot)); > + if (dst_vma->vm_flags & VM_WRITE && !wp_copy) > + _dst_pte = pte_mkwrite(_dst_pte); I like parenthesis around around and :) ie: (dst_vma->vm_flags & VM_WRITE) && !wp_copy I feel it is easier to read. [...] > @@ -416,11 +418,13 @@ static __always_inline ssize_t mfill_atomic_pte(struct mm_struct *dst_mm, > if (!(dst_vma->vm_flags & VM_SHARED)) { > if (!zeropage) > err = mcopy_atomic_pte(dst_mm, dst_pmd, dst_vma, > - dst_addr, src_addr, page); > + dst_addr, src_addr, page, > + wp_copy); > else > err = mfill_zeropage_pte(dst_mm, dst_pmd, > dst_vma, dst_addr); > } else { > + VM_WARN_ON(wp_copy); /* WP only available for anon */ Don't you want to return with error here ? > if (!zeropage) > err = shmem_mcopy_atomic_pte(dst_mm, dst_pmd, > dst_vma, dst_addr, [...]