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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 B19E1C433E0 for ; Fri, 15 Jan 2021 17:10:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6975A2333E for ; Fri, 15 Jan 2021 17:10:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6975A2333E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 29AA68D01AD; Fri, 15 Jan 2021 12:09:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 24BAB8D01AA; Fri, 15 Jan 2021 12:09:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1606B8D01AD; Fri, 15 Jan 2021 12:09:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0081.hostedemail.com [216.40.44.81]) by kanga.kvack.org (Postfix) with ESMTP id EEF2C8D01AA for ; Fri, 15 Jan 2021 12:09:51 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id AA8976D80 for ; Fri, 15 Jan 2021 17:09:51 +0000 (UTC) X-FDA: 77708646582.21.crow20_18177ae27531 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 643BC18103F2A for ; Fri, 15 Jan 2021 17:09:51 +0000 (UTC) X-HE-Tag: crow20_18177ae27531 X-Filterd-Recvd-Size: 8519 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 Jan 2021 17:09:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610730590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Uo187ljIKtl+Ve2u3XKyxHQxREG1CzLvXoZ9sZssXMc=; b=ZgzSco4WL2KtA+FqtxCrxNx7xN7XdeUKu8NKFCfQVkYA7dkKRLIxJQ6om2sHWLvcZuHQ8L aKwSr93iw+C+vTyoQVbO7GiHm4j05U5aQhE2oPy7DLM/bXu2E8ZaZjsHkYMEHRaSY8aivc UcUImcWgzgSFO/BVvKx53gk+uMC6F34= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-4RcsdymTODi3EF_nxmXWwA-1; Fri, 15 Jan 2021 12:09:47 -0500 X-MC-Unique: 4RcsdymTODi3EF_nxmXWwA-1 Received: by mail-qt1-f198.google.com with SMTP id l6so7892774qtr.9 for ; Fri, 15 Jan 2021 09:09:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Uo187ljIKtl+Ve2u3XKyxHQxREG1CzLvXoZ9sZssXMc=; b=W1xsbF3Ho5PEJ579AZ4OYgghktk08FNtteVQmwhLwjsGgIs01OtuNQXpzY0KMRg3P1 BlTfJdsFxwfPHhT0J99p/hbsZOgCJgSbUGWy7pfpZwTLc5enYGVkMeqZyqRdIvCCV4Gb fBstzibzWKc2LM8WTdIZUuG1B0Jo8JOmgaPiJ6femgULWb7WPbG4gP70g80L8hcoaRq/ MwcPkIvZHDfWylICU94ys5/C/MihFK4xCzbevD2uEPFEdvjzNBQVpA4xxD8Rz5l5PJj9 gkol+7a4DaB00nm/b2PrY58GmmaJMAJpDjZ1LARWf2nRX6qxRHCjGa0MVL4Yvfk0SV2A EuSA== X-Gm-Message-State: AOAM532e2alKMl/ClMu0CL/jSlImdtKsGmQReEKIaqKZE/fAgZjHJL9U B7a1hIz4hLTXYoUxTdnst1IR6pwvCKfYzkiJV3lnL6cZ0an/JM0RMpFnpLKDn7gGGcbj8tspwWI O4QLdvZ2Dvsc= X-Received: by 2002:a05:6214:504:: with SMTP id v4mr12626546qvw.54.1610730587426; Fri, 15 Jan 2021 09:09:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZfKqOh3ezoGUMGkQTHnf/tdFrONUsOKGa4/2/CEv0Wfi0RVejL4iZxSP/JZlIQULBxfJCjA== X-Received: by 2002:a05:6214:504:: with SMTP id v4mr12626514qvw.54.1610730587234; Fri, 15 Jan 2021 09:09:47 -0800 (PST) Received: from localhost.localdomain ([142.126.83.202]) by smtp.gmail.com with ESMTPSA id d123sm5187840qke.95.2021.01.15.09.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 09:09:46 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , Mike Kravetz , peterx@redhat.com, Jerome Glisse , "Kirill A . Shutemov" , Hugh Dickins , Axel Rasmussen , Matthew Wilcox , Andrew Morton , Andrea Arcangeli , Nadav Amit Subject: [PATCH RFC 19/30] hugetlb/userfaultfd: Take care of UFFDIO_COPY_MODE_WP Date: Fri, 15 Jan 2021 12:08:56 -0500 Message-Id: <20210115170907.24498-20-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210115170907.24498-1-peterx@redhat.com> References: <20210115170907.24498-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Firstly, pass the wp_copy variable into hugetlb_mcopy_atomic_pte() though= out the stack. Then, apply the UFFD_WP bit if UFFDIO_COPY_MODE_WP is with UFFDIO_COPY. Introduce huge_pte_mkuffd_wp() for it. Note that similar to how we've handled shmem, we'd better keep setting th= e dirty bit even if UFFDIO_COPY_MODE_WP is provided, so that the core mm wi= ll know this page contains valid data and never drop it. Signed-off-by: Peter Xu --- include/asm-generic/hugetlb.h | 5 +++++ include/linux/hugetlb.h | 6 ++++-- mm/hugetlb.c | 9 +++++++-- mm/userfaultfd.c | 12 ++++++++---- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.= h index 8e1e6244a89d..548212eccbd6 100644 --- a/include/asm-generic/hugetlb.h +++ b/include/asm-generic/hugetlb.h @@ -27,6 +27,11 @@ static inline pte_t huge_pte_mkdirty(pte_t pte) return pte_mkdirty(pte); } =20 +static inline pte_t huge_pte_mkuffd_wp(pte_t pte) +{ + return pte_mkuffd_wp(pte); +} + static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot) { return pte_modify(pte, newprot); diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index ebca2ef02212..bd061f7eedcb 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -138,7 +138,8 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm= , pte_t *dst_pte, struct vm_area_struct *dst_vma, unsigned long dst_addr, unsigned long src_addr, - struct page **pagep); + struct page **pagep, + bool wp_copy); int hugetlb_reserve_pages(struct inode *inode, long from, long to, struct vm_area_struct *vma, vm_flags_t vm_flags); @@ -313,7 +314,8 @@ static inline int hugetlb_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) { BUG(); return 0; diff --git a/mm/hugetlb.c b/mm/hugetlb.c index dcbbba53bd10..563b8f70537f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4624,7 +4624,8 @@ int hugetlb_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 address_space *mapping; pgoff_t idx; @@ -4717,8 +4718,12 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst= _mm, } =20 _dst_pte =3D make_huge_pte(dst_vma, page, dst_vma->vm_flags & VM_WRITE)= ; - if (dst_vma->vm_flags & VM_WRITE) + if (dst_vma->vm_flags & VM_WRITE) { _dst_pte =3D huge_pte_mkdirty(_dst_pte); + if (wp_copy) + _dst_pte =3D huge_pte_mkuffd_wp( + huge_pte_wrprotect(_dst_pte)); + } _dst_pte =3D pte_mkyoung(_dst_pte); =20 set_huge_pte_at(dst_mm, dst_addr, dst_pte, _dst_pte); diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 6d4b3b7c7f9f..b00e5e6b8b8b 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -207,7 +207,8 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb= (struct mm_struct *dst_mm, unsigned long dst_start, unsigned long src_start, unsigned long len, - bool zeropage) + bool zeropage, + bool wp_copy) { int vm_alloc_shared =3D dst_vma->vm_flags & VM_SHARED; int vm_shared =3D dst_vma->vm_flags & VM_SHARED; @@ -306,7 +307,8 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb= (struct mm_struct *dst_mm, } =20 err =3D hugetlb_mcopy_atomic_pte(dst_mm, dst_pte, dst_vma, - dst_addr, src_addr, &page); + dst_addr, src_addr, &page, + wp_copy); =20 mutex_unlock(&hugetlb_fault_mutex_table[hash]); i_mmap_unlock_read(mapping); @@ -408,7 +410,8 @@ extern ssize_t __mcopy_atomic_hugetlb(struct mm_struc= t *dst_mm, unsigned long dst_start, unsigned long src_start, unsigned long len, - bool zeropage); + bool zeropage, + bool wp_copy); #endif /* CONFIG_HUGETLB_PAGE */ =20 static __always_inline ssize_t mfill_atomic_pte(struct mm_struct *dst_mm= , @@ -527,7 +530,8 @@ static __always_inline ssize_t __mcopy_atomic(struct = mm_struct *dst_mm, */ if (is_vm_hugetlb_page(dst_vma)) return __mcopy_atomic_hugetlb(dst_mm, dst_vma, dst_start, - src_start, len, zeropage); + src_start, len, zeropage, + wp_copy); =20 if (!vma_is_anonymous(dst_vma) && !vma_is_shmem(dst_vma)) goto out_unlock; --=20 2.26.2